aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2011-04-12 19:39:53 -0400
committerDave Methvin <dave.methvin@gmail.com>2011-04-12 19:39:53 -0400
commit0032e30f7594cbcf63f9f4a3860028abf1f80782 (patch)
treeeca0a4d26bb10a3f1137a7c9d594b6edf78bc9be
parentbebd8bc01e63dcb053412f8b247e4fa611867c55 (diff)
parent73f9ab67058d2dc14ab81c62bd9b228b0e1cad93 (diff)
downloadjquery-0032e30f7594cbcf63f9f4a3860028abf1f80782.tar.gz
jquery-0032e30f7594cbcf63f9f4a3860028abf1f80782.zip
Merge branch 'jslint_function_in_loop' of https://github.com/timmywil/jquery into timmywil-jslint_function_in_loop
-rw-r--r--src/manipulation.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/manipulation.js b/src/manipulation.js
index 52d59d83e..711cb5e88 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -553,6 +553,8 @@ jQuery.extend({
},
clean: function( elems, context, fragment, scripts ) {
+ var checkScriptType;
+
context = context || document;
// !context.createElement fails in IE with an error but returns typeof 'object'
@@ -630,15 +632,16 @@ jQuery.extend({
}
if ( fragment ) {
+ checkScriptType = function( elem ) {
+ return !elem.type || rscriptType.test( elem.type );
+ };
for ( i = 0; ret[i]; i++ ) {
if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
} else {
if ( ret[i].nodeType === 1 ) {
- var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), function( elem ) {
- return !elem.type || rscriptType.test( elem.type );
- });
+ var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
}