diff options
| author | Misko Hevery | 2011-04-12 15:18:08 -0700 |
|---|---|---|
| committer | Misko Hevery | 2011-06-08 13:49:11 -0700 |
| commit | f243c6aeda4c7dc87dac495dfb8942f4c8ba675e (patch) | |
| tree | 5806e488c8ffe709794d5b0a6b769f89a4b2a44d /src/angular-bootstrap.js | |
| parent | 26e651996a9cd7fa1acf6380fad8b335b769554d (diff) | |
| download | angular.js-f243c6aeda4c7dc87dac495dfb8942f4c8ba675e.tar.bz2 | |
removed jqLite warning
Diffstat (limited to 'src/angular-bootstrap.js')
| -rw-r--r-- | src/angular-bootstrap.js | 4 |
1 files changed, 2 insertions, 2 deletions
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]) { |
