Fix for #1198

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index c22c12c..7466236 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -26,37 +26,8 @@ var jQuery = function(a,c) {
        // If the context is global, return a new object
        if ( window == this )
                return new jQuery(a,c);
-
-       // Make sure that a selection was provided
-       a = a || document;
-       
-       // HANDLE: $(function)
-       // Shortcut for document ready
-       if ( jQuery.isFunction(a) )
-               return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
-       
-       // Handle HTML strings
-       if ( typeof a  == "string" ) {
-               // HANDLE: $(html) -> $(array)
-               var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
-               if ( m )
-                       a = jQuery.clean( [ m[1] ] );
-               
-               // HANDLE: $(expr)
-               else
-                       return new jQuery( c ).find( a );
-       }
        
-       return this.setArray(
-               // HANDLE: $(array)
-               a.constructor == Array && a ||
-
-               // HANDLE: $(arraylike)
-               // Watch for when an array-like object is passed as the selector
-               (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
-
-               // HANDLE: $(*)
-               [ a ] );
+       return this.init(a,c);
 };
 
 // Map over the $ in case of overwrite
@@ -170,6 +141,48 @@ var $ = jQuery;
 
 jQuery.fn = jQuery.prototype = {
        /**
+        * Initialize a new jQuery object
+        *
+        * @private
+        * @name init
+        * @param String|Function|Element|Array<Element>|jQuery a selector
+        * @param jQuery|Element|Array<Element> c context
+        * @cat Core
+        */
+       init: function(a,c) {
+               // Make sure that a selection was provided
+               a = a || document;
+
+               // HANDLE: $(function)
+               // Shortcut for document ready
+               if ( jQuery.isFunction(a) )
+                       return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+
+               // Handle HTML strings
+               if ( typeof a  == "string" ) {
+                       // HANDLE: $(html) -> $(array)
+                       var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
+                       if ( m )
+                               a = jQuery.clean( [ m[1] ] );
+
+                       // HANDLE: $(expr)
+                       else
+                               return new jQuery( c ).find( a );
+               }
+
+               return this.setArray(
+                       // HANDLE: $(array)
+                       a.constructor == Array && a ||
+
+                       // HANDLE: $(arraylike)
+                       // Watch for when an array-like object is passed as the selector
+                       (a.jquery || a.length && a != window && (!a.nodeType || (jQuery.browser.msie && a.elements)) && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+
+                       // HANDLE: $(*)
+                       [ a ] );
+       },
+       
+       /**
         * The current version of jQuery.
         *
         * @private
@@ -839,11 +852,30 @@ jQuery.fn = jQuery.prototype = {
         * @cat DOM/Manipulation
         */
        clone: function(deep) {
-               return this.pushStack( jQuery.map( this, function(a){
-                       a = a.cloneNode( deep != undefined ? deep : true );
-                       a.$events = null; // drop $events expando to avoid firing incorrect events
-                       return a;
+               // Need to remove events on the element and its descendants
+               var $this = this.add(this.find("*"));
+               $this.each(function() {
+                       this._$events = {};
+                       for (var type in this.$events)
+                               this._$events[type] = jQuery.extend({},this.$events[type]);
+               }).unbind();
+
+               // Do the clone
+               var r = this.pushStack( jQuery.map( this, function(a){
+                       return a.cloneNode( deep != undefined ? deep : true );
                }) );
+
+               // Add the events back to the original and its descendants
+               $this.each(function() {
+                       var events = this._$events;
+                       for (var type in events)
+                               for (var handler in events[type])
+                                       jQuery.event.add(this, type, events[type][handler], events[type][handler].data);
+                       this._$events = null;
+               });
+
+               // Return the cloned set
+               return r;
        },
 
        /**
@@ -1336,7 +1368,7 @@ jQuery.extend({
 
                // internal only, use removeClass("class")
                remove: function( elem, c ){
-                       elem.className = c ?
+                       elem.className = c != undefined ?
                                jQuery.grep( elem.className.split(/\s+/), function(cur){
                                        return !jQuery.className.has( c, cur ); 
                                }).join(" ") : "";
@@ -1410,7 +1442,7 @@ jQuery.extend({
                        return ret == "" ? "1" : ret;
                }
                
-               if (prop == "float" || prop == "cssFloat")
+               if (prop.match(/float/i))
                        prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
 
                if (!force && elem.style[prop])
@@ -1418,7 +1450,7 @@ jQuery.extend({
 
                else if (document.defaultView && document.defaultView.getComputedStyle) {
 
-                       if (prop == "cssFloat" || prop == "styleFloat")
+                       if (prop.match(/float/i))
                                prop = "float";
 
                        prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
@@ -1510,7 +1542,7 @@ jQuery.extend({
                        if ( 0 === arg.length && !jQuery(arg).is("form, select") )
                                return;
 
-                       if ( arg[0] == undefined || jQuery(arg).is("form, select") )
+                       if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
                                r.push( arg );
                        else
                                r = jQuery.merge( r, arg );
@@ -1526,13 +1558,15 @@ jQuery.extend({
                        "class": "className",
                        "float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
                        cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+                       styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
                        innerHTML: "innerHTML",
                        className: "className",
                        value: "value",
                        disabled: "disabled",
                        checked: "checked",
                        readonly: "readOnly",
-                       selected: "selected"
+                       selected: "selected",
+                       maxlength: "maxLength"
                };
                
                // IE actually uses filters for opacity ... elem is actually elem.style
@@ -1786,7 +1820,7 @@ new function() {
 
        // Figure out what browser is being used
        jQuery.browser = {
-               version: b.match(/.+[xiae][\/ ]([\d.]+)/)[1],
+               version: b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)[1],
                safari: /webkit/.test(b),
                opera: /opera/.test(b),
                msie: /msie/.test(b) && !/opera/.test(b),