git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplifying the camelCase logic used in the CSS and Effects modules.
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
5a00555
..
0fec6e1
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-1,4
+1,4
@@
-(function() {
+var jQuery = (function() {
// Define a local copy of jQuery
var jQuery = function( selector, context ) {
// Define a local copy of jQuery
var jQuery = function( selector, context ) {
@@
-109,7
+109,7
@@
jQuery.fn = jQuery.prototype = {
}
} else {
}
} else {
- ret = buildFragment( [ match[1] ], [ doc ] );
+ ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
}
selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
}
@@
-119,7
+119,9
@@
jQuery.fn = jQuery.prototype = {
} else {
elem = document.getElementById( match[2] );
} else {
elem = document.getElementById( match[2] );
- if ( elem ) {
+ // Check parentNode to catch when Blackberry 4.6 returns
+ // nodes that are no longer in the document #6963
+ if ( elem && elem.parentNode ) {
// Handle the case where IE and Opera return items
// by name instead of ID
if ( elem.id !== match[2] ) {
// Handle the case where IE and Opera return items
// by name instead of ID
if ( elem.id !== match[2] ) {
@@
-441,12
+443,14
@@
jQuery.extend({
return jQuery.type(obj) === "function";
},
return jQuery.type(obj) === "function";
},
- isArray: function( obj ) {
+ isArray: Array.isArray || function( obj ) {
return jQuery.type(obj) === "array";
},
type: function( obj ) {
return jQuery.type(obj) === "array";
},
type: function( obj ) {
- return toString.call(obj).slice(8, -1).toLowerCase();
+ return obj == null ?
+ String( obj ) :
+ toString.call(obj).slice(8, -1).toLowerCase();
},
isPlainObject: function( obj ) {
},
isPlainObject: function( obj ) {
@@
-601,7
+605,7
@@
jQuery.extend({
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
var type = jQuery.type(array);
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
var type = jQuery.type(array);
- if ( array.length == null || type === "string" || type === "function" || type === "regexp" || (typeof type !== "function" && array.setInterval) ) {
+ if ( array.length == null || type === "string" || type === "function" || type === "regexp" || "setInterval" in array ) {
push.call( ret, array );
} else {
jQuery.merge( ret, array );
push.call( ret, array );
} else {
jQuery.merge( ret, array );
@@
-822,6
+826,6
@@
function doScrollCheck() {
}
// Expose jQuery to the global object
}
// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
+return (window.jQuery = window.$ = jQuery);
})();
})();