fix for #3688, setting type attribute on button causes IE to throw error

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 3dfb84a..271e7c4 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -292,9 +292,14 @@ jQuery.fn = jQuery.prototype = {
                return this.prevObject || jQuery(null);
        },
 
+       // For internal use only.
+       // Behaves like an Array's method, not like a jQuery method.
+       push: [].push,
+       sort: [].sort,
+       splice: [].splice,
+
        find: function( selector ) {
-               var ret = this.pushStack( "", "find", selector ), length = 0,
-                       splice = Array.prototype.splice;
+               var ret = this.pushStack( "", "find", selector ), length = 0;
 
                for ( var i = 0, l = this.length; i < l; i++ ) {
                        length = ret.length;
@@ -305,7 +310,7 @@ jQuery.fn = jQuery.prototype = {
                                for ( var n = length; n < ret.length; n++ ) {
                                        for ( var r = 0; r < length; r++ ) {
                                                if ( ret[r] === ret[n] ) {
-                                                       splice.call(ret, n--, 1);
+                                                       ret.splice(n--, 1);
                                                        break;
                                                }
                                        }
@@ -999,7 +1004,7 @@ jQuery.extend({
                        if ( name in elem && notxml && !special ) {
                                if ( set ){
                                        // We can't allow the type property to be changed (since it causes problems in IE)
-                                       if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
+                                       if ( name == "type" && elem.nodeName.match(/(button|input)/i) && elem.parentNode )
                                                throw "type property can't be changed";
 
                                        elem[ name ] = value;
@@ -1284,8 +1289,3 @@ function cleanData( elems ) {
                }
        }
 }
-
-// Helper function used by the dimensions and offset modules
-function num(elem, prop) {
-       return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
-}