git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e06b744
)
Made 'jQuery' unrollable via .noConflict(true) and instances of new Function() have...
author
John Resig
<jeresig@gmail.com>
Wed, 22 Aug 2007 05:44:47 +0000
(
05:44
+0000)
committer
John Resig
<jeresig@gmail.com>
Wed, 22 Aug 2007 05:44:47 +0000
(
05:44
+0000)
src/jquery/jquery.js
patch
|
blob
|
history
diff --git
a/src/jquery/jquery.js
b/src/jquery/jquery.js
index
dfe55bc
..
7c0562a
100644
(file)
--- a/
src/jquery/jquery.js
+++ b/
src/jquery/jquery.js
@@
-19,6
+19,11
@@
* @param jQuery|Element|Array<Element> c context
* @cat Core
*/
* @param jQuery|Element|Array<Element> c context
* @cat Core
*/
+
+// Map over jQuery in case of overwrite
+if ( typeof jQuery != "undefined" )
+ var _jQuery = jQuery;
+
var jQuery = window.jQuery = function(a,c) {
// If the context is global, return a new object
if ( window == this || !this.init )
var jQuery = window.jQuery = function(a,c) {
// If the context is global, return a new object
if ( window == this || !this.init )
@@
-29,7
+34,7
@@
var jQuery = window.jQuery = function(a,c) {
// Map over the $ in case of overwrite
if ( typeof $ != "undefined" )
// Map over the $ in case of overwrite
if ( typeof $ != "undefined" )
- jQuery._$ = $;
+ var _$ = $;
// Map the jQuery namespace to the '$' one
window.$ = jQuery;
// Map the jQuery namespace to the '$' one
window.$ = jQuery;
@@
-1345,9
+1350,10
@@
jQuery.extend({
* @type undefined
* @cat Core
*/
* @type undefined
* @cat Core
*/
- noConflict: function() {
- if ( jQuery._$ )
- $ = jQuery._$;
+ noConflict: function(deep) {
+ window.$ = _$;
+ if ( deep )
+ window.jQuery = _jQuery;
return jQuery;
},
return jQuery;
},
@@
-1851,7
+1857,7
@@
jQuery.extend({
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
if ( typeof fn == "string" )
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
if ( typeof fn == "string" )
- fn = new Function("a","i","return " + fn);
+ fn = eval("function(a,i){return " + fn + "}");
var result = [];
var result = [];
@@
-1905,7
+1911,7
@@
jQuery.extend({
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
if ( typeof fn == "string" )
// If a string is passed in for the function, make a function
// for it (a handy shortcut)
if ( typeof fn == "string" )
- fn = new Function("a","return " + fn);
+ fn = eval("function(a){return " + fn + "}");
var result = [];
var result = [];