Ticket #2543: vars.diff
| File vars.diff, 10.2 KB (added by flesler, 4 years ago) |
|---|
-
src/core.js
729 729 730 730 // args is for internal usage only 731 731 each: function( object, callback, args ) { 732 var i = 0, name, length = object.length; 732 733 if ( args ) { 733 if ( object.length == undefined ) {734 for ( varname in object )734 if ( length == undefined ) { 735 for ( name in object ) 735 736 if ( callback.apply( object[ name ], args ) === false ) 736 737 break; 737 738 } else 738 for ( var i = 0, length = object.length; i < length; i++ )739 for ( ; i < length; i++ ) 739 740 if ( callback.apply( object[ i ], args ) === false ) 740 741 break; 741 742 742 743 // A special, fast, case for the most common use of each 743 744 } else { 744 if ( object.length == undefined ) {745 for ( varname in object )745 if ( length == undefined ) { 746 for ( name in object ) 746 747 if ( callback.call( object[ name ], name, object[ name ] ) === false ) 747 748 break; 748 749 } else 749 for ( var i = 0, length = object.length,value = object[0];750 for ( var value = object[0]; 750 751 i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} 751 752 } 752 753 … … 791 792 792 793 // A method for quickly swapping in/out CSS properties to get correct calculations 793 794 swap: function( elem, options, callback ) { 794 var old = {} ;795 var old = {}, name; 795 796 // Remember the old values, and insert the new ones 796 for ( varname in options ) {797 for ( name in options ) { 797 798 old[ name ] = elem.style[ name ]; 798 799 elem.style[ name ] = options[ name ]; 799 800 } … … 801 802 callback.call( elem ); 802 803 803 804 // Revert the old values 804 for ( varname in options )805 for ( name in options ) 805 806 elem.style[ name ] = old[ name ]; 806 807 }, 807 808 … … 831 832 }, 832 833 833 834 curCSS: function( elem, name, force ) { 834 var ret ;835 var ret, estyle = elem.style; 835 836 836 837 // A helper method for determining if an element's values are broken 837 838 function color( elem ) { … … 844 845 845 846 // We need to handle opacity special in IE 846 847 if ( name == "opacity" && jQuery.browser.msie ) { 847 ret = jQuery.attr( e lem.style, "opacity" );848 ret = jQuery.attr( estyle, "opacity" ); 848 849 849 850 return ret == "" ? 850 851 "1" : … … 852 853 } 853 854 // Opera sometimes will give the wrong display answer, this fixes it, see #2037 854 855 if ( jQuery.browser.opera && name == "display" ) { 855 var save = e lem.style.outline;856 e lem.style.outline = "0 solid black";857 e lem.style.outline = save;856 var save = estyle.outline; 857 estyle.outline = "0 solid black"; 858 estyle.outline = save; 858 859 } 859 860 860 861 // Make sure we're using the right name for getting the float value 861 862 if ( name.match( /float/i ) ) 862 863 name = styleFloat; 863 864 864 if ( !force && e lem.style && elem.style[ name ] )865 ret = elem.style[ name ];865 if ( !force && estyle && estyle[ name ] ) 866 ret = style[ name ]; 866 867 867 868 else if ( document.defaultView && document.defaultView.getComputedStyle ) { 868 869 … … 880 881 // If the element isn't reporting its values properly in Safari 881 882 // then some display: none elements are involved 882 883 else { 883 var swap = [], stack = [] ;884 var swap = [], stack = [], i = 0; 884 885 885 886 // Locate all of the parent display: none elements 886 887 for ( var a = elem; a && color(a); a = a.parentNode ) … … 888 889 889 890 // Go through and make them visible, but in reverse 890 891 // (It would be better if we knew the exact display type that they had) 891 for ( var i = 0; i < stack.length; i++ )892 for ( ; i < stack.length; i++ ) 892 893 if ( color( stack[ i ] ) ) { 893 894 swap[ i ] = stack[ i ].style.display; 894 895 stack[ i ].style.display = "block"; … … 901 902 ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || ""; 902 903 903 904 // Finally, revert the display styles back 904 for ( var i = 0; i < swap.length; i++ )905 for ( ; i < swap.length; i++ ) 905 906 if ( swap[ i ] != null ) 906 907 stack[ i ].style.display = swap[ i ]; 907 908 } … … 924 925 // but a number that has a weird ending, we need to convert it to pixels 925 926 if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { 926 927 // Remember the original values 927 var style = e lem.style.left, runtimeStyle = elem.runtimeStyle.left;928 var style = estyle.left, runtimeStyle = elem.runtimeStyle.left; 928 929 929 930 // Put in the new values to get a computed value out 930 931 elem.runtimeStyle.left = elem.currentStyle.left; 931 e lem.style.left = ret || 0;932 ret = e lem.style.pixelLeft + "px";932 estyle.left = ret || 0; 933 ret = estyle.pixelLeft + "px"; 933 934 934 935 // Revert the changed values 935 e lem.style.left = style;936 estyle.left = style; 936 937 elem.runtimeStyle.left = runtimeStyle; 937 938 } 938 939 } … … 1144 1145 1145 1146 // Also, we need to make sure that the correct elements are being returned 1146 1147 // (IE returns comment nodes in a '*' query) 1148 var i = 0; 1147 1149 if ( jQuery.browser.msie ) { 1148 for ( var i = 0; second[ i ]; i++ )1150 for (; second[ i ]; i++ ) 1149 1151 if ( second[ i ].nodeType != 8 ) 1150 1152 first.push( second[ i ] ); 1151 1153 1152 1154 } else 1153 for ( var i = 0; second[ i ]; i++ )1155 for (; second[ i ]; i++ ) 1154 1156 first.push( second[ i ] ); 1155 1157 1156 1158 return first; -
src/fx.js
76 76 if ( this.nodeType != 1) 77 77 return false; 78 78 79 var opt = jQuery.extend({}, optall) ;80 varhidden = jQuery(this).is(":hidden"), self = this;79 var opt = jQuery.extend({}, optall), 80 hidden = jQuery(this).is(":hidden"), self = this; 81 81 82 82 for ( var p in prop ) { 83 83 if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) -
src/selector.js
114 114 115 115 t = jQuery.trim(t); 116 116 117 var foundToken = false ;117 var foundToken = false, 118 118 119 119 // An attempt at speeding up child selectors that 120 120 // point to a specific element tag 121 var re = quickChild;122 varm = re.exec(t);121 re = quickChild, 122 m = re.exec(t); 123 123 124 124 if ( m ) { 125 125 nodeName = m[1].toUpperCase(); … … 188 188 189 189 } else { 190 190 // Optimize for the case nodeName#idName 191 varre2 = quickID;192 varm = re2.exec(t);191 re2 = quickID; 192 m = re2.exec(t); 193 193 194 194 // Re-organize the results, so that they're consistent 195 195 if ( m ) { … … 222 222 ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : []; 223 223 } else { 224 224 // We need to find all descendant elements 225 for ( vari = 0; ret[i]; i++ ) {225 for ( i = 0; ret[i]; i++ ) { 226 226 // Grab the tag name being searched for 227 227 var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2]; 228 228 … … 242 242 var tmp = []; 243 243 244 244 // Try to find the element with the ID 245 for ( vari = 0; r[i]; i++ )245 for ( i = 0; r[i]; i++ ) 246 246 if ( r[i].getAttribute("id") == m[2] ) { 247 247 tmp = [ r[i] ]; 248 248 break; … … 301 301 while ( t && t != last ) { 302 302 last = t; 303 303 304 var p = jQuery.parse, m ;304 var p = jQuery.parse, m, i = 0, tmp = []; 305 305 306 for ( var i = 0; p[i]; i++ ) {306 for ( ; p[i]; i++ ) { 307 307 m = p[i].exec( t ); 308 308 309 309 if ( m ) { … … 331 331 r = jQuery.classFilter(r, m[2], not); 332 332 333 333 else if ( m[1] == "[" ) { 334 var t mp = [], type = m[3];334 var type = m[3], i = 0, rl = r.length; 335 335 336 for ( var i = 0, rl = r.length; i < rl; i++ ) {336 for ( ; i < rl; i++ ) { 337 337 var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ]; 338 338 339 339 if ( z == null || /href|src|selected/.test(m[2]) ) … … 352 352 353 353 // We can get a speed boost by handling nth-child here 354 354 } else if ( m[1] == ":" && m[2] == "nth-child" ) { 355 var merge = {}, tmp = [],355 var merge = {}, 356 356 // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' 357 357 test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( 358 358 m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" || 359 359 !/\D/.test(m[3]) && "0n+" + m[3] || m[3]), 360 360 // calculate the numbers (first)n+(last) including if they are negative 361 first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0; 361 first = (test[1] + (test[2] || 1)) - 0; 362 last = test[3] - 0; 362 363 363 364 // loop through all the elements left in the jQuery object 364 for ( vari = 0, rl = r.length; i < rl; i++ ) {365 for ( i = 0, rl = r.length; i < rl; i++ ) { 365 366 var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode); 366 367 367 368 if ( !merge[id] ) { … … 410 411 }, 411 412 412 413 dir: function( elem, dir ){ 413 var matched = [] ;414 varcur = elem[dir];414 var matched = [], 415 cur = elem[dir]; 415 416 while ( cur && cur != document ) { 416 417 if ( cur.nodeType == 1 ) 417 418 matched.push( cur ); -
src/event.js
105 105 if ( elem.nodeType == 3 || elem.nodeType == 8 ) 106 106 return; 107 107 108 var events = jQuery.data(elem, "events"), ret , index;108 var events = jQuery.data(elem, "events"), ret; 109 109 110 110 if ( events ) { 111 111 // Unbind all events for the element -
src/ajax.js
233 233 // If we're requesting a remote document 234 234 // and trying to load JSON or Script with a GET 235 235 if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) { 236 var head = document.getElementsByTagName("head")[0] ;237 varscript = document.createElement("script");236 var head = document.getElementsByTagName("head")[0], 237 script = document.createElement("script"); 238 238 script.src = s.url; 239 239 if (s.scriptCharset) 240 240 script.charset = s.scriptCharset; … … 443 443 }, 444 444 445 445 httpData: function( r, type ) { 446 var ct = r.getResponseHeader("content-type") ;447 var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;448 vardata = xml ? r.responseXML : r.responseText;446 var ct = r.getResponseHeader("content-type"), 447 xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0, 448 data = xml ? r.responseXML : r.responseText; 449 449 450 450 if ( xml && data.documentElement.tagName == "parsererror" ) 451 451 throw "parsererror";