git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced all x.constructor == String comparsions with typeof x == "string"
[jquery.git]
/
src
/
ajax
/
ajax.js
diff --git
a/src/ajax/ajax.js
b/src/ajax/ajax.js
index
652bd2d
..
f0f448a
100644
(file)
--- a/
src/ajax/ajax.js
+++ b/
src/ajax/ajax.js
@@
-124,12
+124,7
@@
jQuery.fn.extend({
// for some weird reason, it doesn't work if the callback is ommited
jQuery.getScript( this.src );
else {
// for some weird reason, it doesn't work if the callback is ommited
jQuery.getScript( this.src );
else {
- // TODO extract into $.eval
- var data = this.text || this.textContent || this.innerHTML || "";
- if (window.execScript)
- window.execScript( data );
- else
- window.setTimeout( data, 0 );
+ jQuery.eval ( this.text || this.textContent || this.innerHTML || "" );
}
}).end();
}
}
}).end();
}
@@
-688,12
+683,8
@@
jQuery.extend({
data = type == "xml" || data ? r.responseXML : r.responseText;
// If the type is "script", eval it in global context
data = type == "xml" || data ? r.responseXML : r.responseText;
// If the type is "script", eval it in global context
- // TODO extract as $.eval
if ( type == "script" ) {
if ( type == "script" ) {
- if (window.execScript)
- window.execScript( data );
- else
- window.setTimeout( data, 0 );
+ jQuery.eval( data );
}
// Get the JavaScript object, if JSON is used.
}
// Get the JavaScript object, if JSON is used.
@@
-734,6
+725,14
@@
jQuery.extend({
// Return the resulting serialization
return s.join("&");
// Return the resulting serialization
return s.join("&");
+ },
+
+ // TODO document me
+ eval: function(data) {
+ if (window.execScript)
+ window.execScript( data );
+ else
+ eval.call( window, data );
}
});
}
});