| 1 | diff C:/Documents and Settings/Dan G. Switzer II/Desktop/anim_bug/lib/jquery-1.2.3.js C:/Documents and Settings/Dan G. Switzer II/Desktop/anim_bug/lib/jquery-1.2.3-anim-fix.js |
|---|
| 2 | 2962c2962,2964 |
|---|
| 3 | < |
|---|
| 4 | --- |
|---|
| 5 | > // dan - check to see if this the first item in queue |
|---|
| 6 | > var bFirst = (fx_orig_state==null && queue( this[0], "fx" ).length==0); |
|---|
| 7 | > |
|---|
| 8 | 2966c2968 |
|---|
| 9 | < |
|---|
| 10 | --- |
|---|
| 11 | > |
|---|
| 12 | 2987a2990,2992 |
|---|
| 13 | > // dan - copy options |
|---|
| 14 | > if( bFirst ) fx_orig_state = opt; |
|---|
| 15 | > |
|---|
| 16 | 2988a2994 |
|---|
| 17 | > |
|---|
| 18 | 3028c3034 |
|---|
| 19 | < |
|---|
| 20 | --- |
|---|
| 21 | > |
|---|
| 22 | 3081c3087 |
|---|
| 23 | < |
|---|
| 24 | --- |
|---|
| 25 | > |
|---|
| 26 | 3146a3153,3155 |
|---|
| 27 | > // dan - to store the original state |
|---|
| 28 | > var fx_orig_state = null; |
|---|
| 29 | > |
|---|
| 30 | 3248a3258,3267 |
|---|
| 31 | > // dan - restore back to last state or the complete original state |
|---|
| 32 | > var props = this.options; |
|---|
| 33 | > // dan - if we're restoring to the original state |
|---|
| 34 | > if( done && fx_orig_state != null ){ |
|---|
| 35 | > // restore to original state |
|---|
| 36 | > props = fx_orig_state; |
|---|
| 37 | > // flag we've restored state only when the queue is empty |
|---|
| 38 | > if( queue(this.elem, "fx").length==0 ) fx_orig_state = null; |
|---|
| 39 | > } |
|---|
| 40 | > |
|---|
| 41 | 3250c3269 |
|---|
| 42 | < if ( this.options.display != null ) { |
|---|
| 43 | --- |
|---|
| 44 | > if ( props.display != null ) { |
|---|
| 45 | 3252c3271 |
|---|
| 46 | < this.elem.style.overflow = this.options.overflow; |
|---|
| 47 | --- |
|---|
| 48 | > this.elem.style.overflow = props.overflow; |
|---|
| 49 | 3255c3274 |
|---|
| 50 | < this.elem.style.display = this.options.display; |
|---|
| 51 | --- |
|---|
| 52 | > this.elem.style.display = props.display; |
|---|
| 53 | 3261c3280 |
|---|
| 54 | < if ( this.options.hide ) |
|---|
| 55 | --- |
|---|
| 56 | > if ( props.hide ) |
|---|
| 57 | 3265,3267c3284,3286 |
|---|
| 58 | < if ( this.options.hide || this.options.show ) |
|---|
| 59 | < for ( var p in this.options.curAnim ) |
|---|
| 60 | < jQuery.attr(this.elem.style, p, this.options.orig[p]); |
|---|
| 61 | --- |
|---|
| 62 | > if ( props.hide || props.show ) |
|---|
| 63 | > for ( var p in props.curAnim ) |
|---|
| 64 | > jQuery.attr(this.elem.style, p, props.orig[p]); |
|---|
| 65 | 3273c3292 |
|---|
| 66 | < this.options.complete.apply( this.elem ); |
|---|
| 67 | --- |
|---|
| 68 | > props.complete.apply( this.elem ); |
|---|
