X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore.js;h=829e1536379f8487a1ba926c954e2358949b4972;hb=0865b073f81513056f46296cd2a236ab2ca35703;hp=bcb9af8e3046c7f176e5260d29f32bbd04d5025a;hpb=db076b06f5e01a9d544cc0a505e52debf730f179;p=jquery.git diff --git a/src/core.js b/src/core.js index bcb9af8..829e153 100644 --- a/src/core.js +++ b/src/core.js @@ -1125,13 +1125,15 @@ jQuery.extend({ return (text || "").replace( /^\s+|\s+$/g, "" ); }, + // NOTE: Due to the conflict with Scriptaculous (http://dev.jquery.com/ticket/3248) + // We remove support for functions since jQuery 1.3 makeArray: function( array ) { var ret = []; if( array != null ){ var i = array.length; - //the window, strings and functions also have 'length' - if( i == null || array.split || array.setInterval || array.call ) + // The window, strings (and functions) also have 'length' + if( i == null || typeof array == 'string' || array.setInterval ) ret[0] = array; else while( i )