Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-17 07:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix clobber test in angular-bootstrap.js for FF

Browse source
This commit is contained in:
Igor Minar 2011-01-20 14:45:53 -08:00
parent 4a569560d8
commit c8bb044be1
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/angular-bootstrap.js vendored
View file

@ -52,7 +52,9 @@
}
else if (!globalVars.hasOwnProperty(varKey)) {
//console.log('new global variable found: ', prop);
globalVars[varKey] = window[prop];
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])) {
clobbered.push(prop);
console.error("Global variable clobbered by script " + file + "! Variable name: " + prop);
@ -83,11 +85,13 @@
// initialize the window property cache
for (prop in window) {
globalVars[key(prop)] = window[prop];
try {
globalVars[key(prop)] = window[prop];
} catch(e) {} //ignore properties that throw exception when accessed (common in FF)
}
// load the js scripts
for (i in arguments) {
for (i in Array.prototype.slice.call(arguments, 0)) {
file = arguments[i];
document.write('<script type="text/javascript" src="' + serverPath + file + '" ' +
'onload="angularClobberTest(\'' + file + '\')"></script>');