From f243c6aeda4c7dc87dac495dfb8942f4c8ba675e Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Tue, 12 Apr 2011 15:18:08 -0700 Subject: removed jqLite warning --- src/angular-bootstrap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/angular-bootstrap.js') diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js index 946968ab..b1140ec9 100644 --- a/src/angular-bootstrap.js +++ b/src/angular-bootstrap.js @@ -55,17 +55,17 @@ try { globalVars[varKey] = window[prop]; } catch(e) {} //ignore properties that throw exception when accessed (common in FF) - } else if (globalVars[varKey] !== window[prop] && !isActuallyNaN(window[prop])) { + } else if (globalVars[varKey] !== window[prop] && !isActuallyNaN(window[prop]) && prop != 'jqLite') { clobbered.push(prop); console.error("Global variable clobbered by script " + file + "! Variable name: " + prop); globalVars[varKey] = window[prop]; } } - for (varKey in globalVars) { prop = varKey.substr(11); if (clobbered.indexOf(prop) == -1 && prop != 'event' && + prop != 'jqLite' && !isActuallyNaN(globalVars[varKey]) && globalVars[varKey] !== window[prop]) { -- cgit v1.2.3