Changeset 765e62 in indico

Timestamp:

05/25/11 16:10:36 (2 years ago)

Author:

Adrian Moennich <jerome.ernst.monnich@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

daf70c

Parents:

431770

Message:

[MIN] Upgrade jQuery 1.6 -> 1.6.1

File:

• indico/htdocs/js/jquery/jquery.js (modified) (45 diffs)

indico/htdocs/js/jquery/jquery.js

@@ -1 +1 @@
 /*!
- * jQuery JavaScript Library v1.6
+ * jQuery JavaScript Library v1.6.1
  * http://jquery.com/
  *
@@ -12 +12 @@
  * Released under the MIT, BSD, and GPL Licenses.
  *
- * Date: Mon May 2 13:50:00 2011 -0400
+ * Date: Thu May 12 15:04:36 2011 -0400
  */
 (function( window, undefined ) {
@@ -205 +205 @@
 
         // The current version of jQuery being used
-        jquery: "1.6",
+        jquery: "1.6.1",
 
         // The default length of a jQuery object is 0
@@ -1056 +1056 @@
                                                         deferred[ handler ](function() {
                                                                 returned = fn.apply( this, arguments );
-                                                                if ( jQuery.isFunction( returned.promise ) ) {
+                                                                if ( returned && jQuery.isFunction( returned.promise ) ) {
                                                                         returned.promise().then( newDefer.resolve, newDefer.reject );
                                                                 } else {
@@ -1138 +1138 @@
 
         var div = document.createElement( "div" ),
+                documentElement = document.documentElement,
                 all,
                 a,
@@ -1285 +1286 @@
         }
         body.appendChild( div );
-        document.documentElement.appendChild( body );
+        documentElement.insertBefore( body, documentElement.firstChild );
 
         // Check if a disconnected checkbox will retain its checked
@@ -1340 +1341 @@
                 div.appendChild( marginDiv );
                 support.reliableMarginRight =
-                        ( parseInt( document.defaultView.getComputedStyle( marginDiv, null ).marginRight, 10 ) || 0 ) === 0;
+                        ( parseInt( ( document.defaultView.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
         }
 
         // Remove the body element we added
         body.innerHTML = "";
-        document.documentElement.removeChild( body );
+        documentElement.removeChild( body );
 
         // Technique from Juriy Zaytsev
@@ -1476 +1477 @@
 
                 if ( data !== undefined ) {
-                        thisCache[ name ] = data;
+                        thisCache[ jQuery.camelCase( name ) ] = data;
                 }
 
@@ -1486 +1487 @@
                 }
 
-                return getByName ? thisCache[ name ] : thisCache;
+                return getByName ? thisCache[ jQuery.camelCase( name ) ] : thisCache;
         },
 
@@ -1662 +1663 @@
         // data from the HTML5 data-* attribute
         if ( data === undefined && elem.nodeType === 1 ) {
-                name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase();
+                var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase();
 
                 data = elem.getAttribute( name );
@@ -1851 +1852 @@
                         deferDataKey = type + "defer",
                         queueDataKey = type + "queue",
-                        markDataKey = type + "mark";
+                        markDataKey = type + "mark",
+                        tmp;
                 function resolve() {
                         if ( !( --count ) ) {
@@ -1880 +1882 @@
         rfocusable = /^(?:button|input|object|select|textarea)$/i,
         rclickable = /^a(?:rea)?$/i,
-        rspecial = /^(?:data-|aria-)/,
+        rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
         rinvalidChar = /\:/,
-        formHook;
+        formHook, boolHook;
 
 jQuery.fn.extend({
@@ -1900 +1902 @@
         
         removeProp: function( name ) {
+                name = jQuery.propFix[ name ] || name;
                 return this.each(function() {
                         // try/catch handles cases where IE balks (such as removing a property on window)
@@ -2073 +2076 @@
 
                         // If set returns undefined, fall back to normal setting
-                        if ( !hooks || ("set" in hooks && hooks.set( this, val, "value" ) === undefined) ) {
+                        if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
                                 this.value = val;
                         }
@@ -2092 +2095 @@
                 select: {
                         get: function( elem ) {
-                                var index = elem.selectedIndex,
+                                var value,
+                                        index = elem.selectedIndex,
                                         values = [],
                                         options = elem.options,
@@ -2159 +2163 @@
         attrFix: {
                 // Always normalize to ensure hook usage
-                tabindex: "tabIndex",
-                readonly: "readOnly"
+                tabindex: "tabIndex"
         },
         
@@ -2174 +2177 @@
                         return jQuery( elem )[ name ]( value );
                 }
-                
+
+                // Fallback to prop when attributes are not supported
+                if ( !("getAttribute" in elem) ) {
+                        return jQuery.prop( elem, name, value );
+                }
+
                 var ret, hooks,
                         notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-                
+
                 // Normalize the name if needed
                 name = notxml && jQuery.attrFix[ name ] || name;
 
-                // Get the appropriate hook, or the formHook
-                // if getSetAttribute is not supported and we have form objects in IE6/7
-                hooks = jQuery.attrHooks[ name ] ||
-                        ( formHook && (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ?
-                                formHook :
-                                undefined );
+                hooks = jQuery.attrHooks[ name ];
+
+                if ( !hooks ) {
+                        // Use boolHook for boolean attributes
+                        if ( rboolean.test( name ) &&
+                                (typeof value === "boolean" || value === undefined || value.toLowerCase() === name.toLowerCase()) ) {
+
+                                hooks = boolHook;
+
+                        // Use formHook for forms and if the name contains certain characters
+                        } else if ( formHook && (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) {
+                                hooks = formHook;
+                        }
+                }
 
                 if ( value !== undefined ) {
 
-                        if ( value === null || (value === false && !rspecial.test( name )) ) {
+                        if ( value === null ) {
                                 jQuery.removeAttr( elem, name );
                                 return undefined;
@@ -2198 +2214 @@
 
                         } else {
-
-                                // Set boolean attributes to the same name
-                                if ( value === true && !rspecial.test( name ) ) {
-                                        value = name;
-                                }
-
                                 elem.setAttribute( name, "" + value );
                                 return value;
                         }
 
+                } else if ( hooks && "get" in hooks && notxml ) {
+                        return hooks.get( elem, name );
+
                 } else {
 
-                        if ( hooks && "get" in hooks && notxml ) {
-                                return hooks.get( elem, name );
-
-                        } else {
-
-                                ret = elem.getAttribute( name );
-
-                                // Non-existent attributes return null, we normalize to undefined
-                                return ret === null ?
-                                        undefined :
-                                        ret;
-                        }
-                }
-        },
-        
+                        ret = elem.getAttribute( name );
+
+                        // Non-existent attributes return null, we normalize to undefined
+                        return ret === null ?
+                                undefined :
+                                ret;
+                }
+        },
+
         removeAttr: function( elem, name ) {
+                var propName;
                 if ( elem.nodeType === 1 ) {
                         name = jQuery.attrFix[ name ] || name;
@@ -2235 +2243 @@
                                 jQuery.attr( elem, name, "" );
                                 elem.removeAttributeNode( elem.getAttributeNode( name ) );
+                        }
+
+                        // Set corresponding property to false for boolean attributes
+                        if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) {
+                                elem[ propName ] = false;
                         }
                 }
@@ -2249 +2262 @@
                                         // Reset value to it's default in case type is set after value
                                         // This is for element creation
-                                        var val = elem.getAttribute("value");
+                                        var val = elem.value;
                                         elem.setAttribute( "type", value );
                                         if ( val ) {
@@ -2272 +2285 @@
                 }
         },
-        
-        propFix: {},
-        
-        prop: function( elem, name, value ) {
-                var nType = elem.nodeType;
-                
-                // don't get/set properties on text, comment and attribute nodes
-                if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-                        return undefined;
-                }
-                
-                var ret, hooks,
-                        notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-                
-                // Try to normalize/fix the name
-                name = notxml && jQuery.propFix[ name ] || name;
-                
-                hooks = jQuery.propHooks[ name ];
-                
-                if ( value !== undefined ) {
-                        if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-                                return ret;
-                        
-                        } else {
-                                return (elem[ name ] = value);
-                        }
-                
-                } else {
-                        if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) {
-                                return ret;
-                                
-                        } else {
-                                return elem[ name ];
-                        }
-                }
-        },
-        
-        propHooks: {}
-});
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !jQuery.support.getSetAttribute ) {
-        jQuery.attrFix = jQuery.extend( jQuery.attrFix, {
+
+        propFix: {
+                tabindex: "tabIndex",
+                readonly: "readOnly",
                 "for": "htmlFor",
                 "class": "className",
@@ -2323 +2297 @@
                 colspan: "colSpan",
                 usemap: "useMap",
-                frameborder: "frameBorder"
-        });
+                frameborder: "frameBorder",
+                contenteditable: "contentEditable"
+        },
+        
+        prop: function( elem, name, value ) {
+                var nType = elem.nodeType;
+
+                // don't get/set properties on text, comment and attribute nodes
+                if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+                        return undefined;
+                }
+
+                var ret, hooks,
+                        notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+                // Try to normalize/fix the name
+                name = notxml && jQuery.propFix[ name ] || name;
+                
+                hooks = jQuery.propHooks[ name ];
+
+                if ( value !== undefined ) {
+                        if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+                                return ret;
+
+                        } else {
+                                return (elem[ name ] = value);
+                        }
+
+                } else {
+                        if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) {
+                                return ret;
+
+                        } else {
+                                return elem[ name ];
+                        }
+                }
+        },
+        
+        propHooks: {}
+});
+
+// Hook for boolean attributes
+boolHook = {
+        get: function( elem, name ) {
+                // Align boolean attributes with corresponding properties
+                return elem[ jQuery.propFix[ name ] || name ] ?
+                        name.toLowerCase() :
+                        undefined;
+        },
+        set: function( elem, value, name ) {
+                var propName;
+                if ( value === false ) {
+                        // Remove boolean attributes when set to false
+                        jQuery.removeAttr( elem, name );
+                } else {
+                        // value is true since we know at this point it's type boolean and not false
+                        // Set boolean attributes to the same name and set the DOM property
+                        propName = jQuery.propFix[ name ] || name;
+                        if ( propName in elem ) {
+                                // Only set the IDL specifically if it already exists on the element
+                                elem[ propName ] = value;
+                        }
+
+                        elem.setAttribute( name, name.toLowerCase() );
+                }
+                return name;
+        }
+};
+
+// Use the value property for back compat
+// Use the formHook for button elements in IE6/7 (#1954)
+jQuery.attrHooks.value = {
+        get: function( elem, name ) {
+                if ( formHook && jQuery.nodeName( elem, "button" ) ) {
+                        return formHook.get( elem, name );
+                }
+                return elem.value;
+        },
+        set: function( elem, value, name ) {
+                if ( formHook && jQuery.nodeName( elem, "button" ) ) {
+                        return formHook.set( elem, value, name );
+                }
+                // Does not return so that setAttribute is also used
+                elem.value = value;
+        }
+};
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !jQuery.support.getSetAttribute ) {
+
+        // propFix is more comprehensive and contains all fixes
+        jQuery.attrFix = jQuery.propFix;
         
         // Use this for any attribute on a form in IE6/7
-        formHook = jQuery.attrHooks.name = jQuery.attrHooks.value = jQuery.valHooks.button = {
+        formHook = jQuery.attrHooks.name = jQuery.valHooks.button = {
                 get: function( elem, name ) {
                         var ret;
-                        if ( name === "value" && !jQuery.nodeName( elem, "button" ) ) {
-                                return elem.getAttribute( name );
-                        }
                         ret = elem.getAttributeNode( name );
-                        // Return undefined if not specified instead of empty string
-                        return ret && ret.specified ?
+                        // Return undefined if nodeValue is empty string
+                        return ret && ret.nodeValue !== "" ?
                                 ret.nodeValue :
                                 undefined;
@@ -3087 +3148 @@
         var parent = event.relatedTarget;
 
+        // set the correct event type
+        event.type = event.data;
+
         // Firefox sometimes assigns relatedTarget a XUL element
         // which we cannot access the parentNode property of
@@ -3096 +3160 @@
                         return;
                 }
+
                 // Traverse up the tree
                 while ( parent && parent !== this ) {
@@ -3102 +3167 @@
 
                 if ( parent !== this ) {
-                        // set the correct event type
-                        event.type = event.data;
-
                         // handle event if we actually just moused on to a non sub-element
                         jQuery.event.handle.apply( this, arguments );
@@ -4292 +4354 @@
 
                 reset: function( elem ) {
-                        return elem.nodeName.toLowerCase() === "input" && "reset" === elem.type;
+                        var name = elem.nodeName.toLowerCase();
+                        return (name === "input" || name === "button") && "reset" === elem.type;
                 },
 
@@ -4558 +4621 @@
 } else {
         sortOrder = function( a, b ) {
+                // The nodes are identical, we can exit early
+                if ( a === b ) {
+                        hasDuplicate = true;
+                        return 0;
+
+                // Fallback to using sourceIndex (in IE) if it's available on both nodes
+                } else if ( a.sourceIndex && b.sourceIndex ) {
+                        return a.sourceIndex - b.sourceIndex;
+                }
+
                 var al, bl,
                         ap = [],
@@ -4565 +4638 @@
                         cur = aup;
 
-                // The nodes are identical, we can exit early
-                if ( a === b ) {
-                        hasDuplicate = true;
-                        return 0;
-
                 // If the nodes are siblings (or identical) we can do a quick check
-                } else if ( aup === bup ) {
+                if ( aup === bup ) {
                         return siblingCheck( a, b );
 
@@ -5395 +5463 @@
         rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
         rscriptType = /\/(java|ecma)script/i,
+        rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
         wrapMap = {
                 option: [ 1, "<select multiple='multiple'>", "</select>" ],
@@ -5885 +5954 @@
         if ( "getElementsByTagName" in elem ) {
                 return elem.getElementsByTagName( "*" );
-        
+
         } else if ( "querySelectorAll" in elem ) {
                 return elem.querySelectorAll( "*" );
@@ -5967 +6036 @@
                 }
 
-                var ret = [];
+                var ret = [], j;
 
                 for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
@@ -6013 +6082 @@
                                                                         [];
 
-                                                for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+                                                for ( j = tbody.length - 1; j >= 0 ; --j ) {
                                                         if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
                                                                 tbody[ j ].parentNode.removeChild( tbody[ j ] );
@@ -6034 +6103 @@
                         if ( !jQuery.support.appendChecked ) {
                                 if ( elem[0] && typeof (len = elem.length) === "number" ) {
-                                        for ( i = 0; i < len; i++ ) {
-                                                findInputs( elem[i] );
+                                        for ( j = 0; j < len; j++ ) {
+                                                findInputs( elem[j] );
                                         }
                                 } else {
@@ -6123 +6192 @@
                 });
         } else {
-                jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+                jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
         }
 
@@ -8000 +8069 @@
                 }
 
+                // Do not change referenced properties as per-property easing will be lost
+                prop = jQuery.extend( {}, prop );
+
                 return this[ optall.queue === false ? "each" : "queue" ](function() {
                         // XXX 'this' does not always have a nodeName when running the
@@ -8008 +8080 @@
                         }
 
-                        var opt = jQuery.extend({}, optall),
+                        var opt = jQuery.extend( {}, optall ),
                                 isElement = this.nodeType === 1,
                                 hidden = isElement && jQuery(this).is(":hidden"),
@@ -8027 +8099 @@
                                 }
 
-                                val = prop[name];
+                                val = prop[ name ];
+
+                                // easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
+                                if ( jQuery.isArray( val ) ) {
+                                        opt.animatedProperties[ name ] = val[ 1 ];
+                                        val = prop[ name ] = val[ 0 ];
+                                } else {
+                                        opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
+                                }
 
                                 if ( val === "hide" && hidden || val === "show" && !hidden ) {
-                                        return opt.complete.call(this);
+                                        return opt.complete.call( this );
                                 }
 
@@ -8049 +8129 @@
 
                                                 } else {
-                                                        display = defaultDisplay(this.nodeName);
+                                                        display = defaultDisplay( this.nodeName );
 
                                                         // inline-level elements accept inline-block;
@@ -8063 +8143 @@
                                         }
                                 }
-
-                                // easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
-                                opt.animatedProperties[name] = jQuery.isArray( val ) ?
-                                        val[1]:
-                                        opt.specialEasing && opt.specialEasing[name] || opt.easing || 'swing';
                         }
 
@@ -8076 +8151 @@
                         for ( p in prop ) {
                                 e = new jQuery.fx( this, opt, p );
-
-                                val = prop[p];
+                                val = prop[ p ];
 
                                 if ( rfxtypes.test(val) ) {
@@ -8083 +8157 @@
 
                                 } else {
-                                        parts = rfxnum.exec(val);
+                                        parts = rfxnum.exec( val );
                                         start = e.cur();
 
                                         if ( parts ) {
                                                 end = parseFloat( parts[2] );
-                                                unit = parts[3] || ( jQuery.cssNumber[ name ] ? "" : "px" );
+                                                unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
 
                                                 // We need to compute starting value
@@ -8099 +8173 @@
                                                 // If a +=/-= token was provided, we're doing a relative animation
                                                 if ( parts[1] ) {
-                                                        end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+                                                        end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
                                                 }
 
@@ -8127 +8201 @@
                                 jQuery._unmark( true, this );
                         }
-                        // go in reverse order so anything added to the queue during the loop is ignored
                         while ( i-- ) {
                                 if ( timers[i].elem === this ) {
@@ -8375 +8448 @@
                         } else {
                                 n = t - this.startTime;
-
                                 this.state = n / options.duration;
+
                                 // Perform the easing function, defaults to swing
-                                this.pos = jQuery.easing[options.animatedProperties[this.prop]](this.state, n, 0, 1, options.duration);
+                                this.pos = jQuery.easing[ options.animatedProperties[ this.prop ] ]( this.state, n, 0, 1, options.duration );
                                 this.now = this.start + ((this.end - this.start) * this.pos);
                         }
@@ -8391 +8464 @@
 jQuery.extend( jQuery.fx, {
         tick: function() {
-                var timers = jQuery.timers,
-                        i = timers.length;
-                while ( i-- ) {
+                for ( var timers = jQuery.timers, i = 0 ; i < timers.length ; ++i ) {
                         if ( !timers[i]() ) {
-                                timers.splice(i, 1);
+                                timers.splice(i--, 1);
                         }
                 }