fix(angular-bootstrap): fix boostrap scripts that broke w\ 5a2dcb9a

Commit 5a2dcb9a doesn't properly modify angular-boostrap.js.

This fix resolves issues and makes both the regular and scenario
version of angular-boostrap.js functional.
This commit is contained in:
Igor Minar 2011-10-30 22:15:59 -07:00
parent 95fdb1231f
commit 84873e7f4e
2 changed files with 12 additions and 5 deletions

View file

@ -5,14 +5,22 @@
* (c) 2010-2011 AngularJS http://angularjs.org * (c) 2010-2011 AngularJS http://angularjs.org
* License: MIT * License: MIT
*/ */
(function(window) { (function(window, document) {
var filename = /^(.*\/)angular-bootstrap.js(#.*)?$/, var filename = /^(.*\/)angular-bootstrap.js(#.*)?$/,
scripts = document.getElementsByTagName("SCRIPT"), scripts = document.getElementsByTagName("SCRIPT"),
autobind = scripts[scripts.length-1].getAttribute('ng:autobind'),
config,
serverPath, serverPath,
match, match,
globalVars = {}; globalVars = {};
if (autobind) {
config = {autobind: autobind};
} else {
config = (autobind == '') ? {autobind: true} : {}
}
for(var j = 0; j < scripts.length; j++) { for(var j = 0; j < scripts.length; j++) {
match = (scripts[j].src || "").match(filename); match = (scripts[j].src || "").match(filename);
if (match) { if (match) {
@ -99,7 +107,7 @@
// empty the cache to prevent mem leaks // empty the cache to prevent mem leaks
globalVars = {}; globalVars = {};
angularInit({autobind:true}, document); angularInit(config, document);
} }
if (window.addEventListener) { if (window.addEventListener) {
@ -108,5 +116,5 @@
window.attachEvent('onload', onLoadListener); window.attachEvent('onload', onLoadListener);
} }
})(window); })(window, document);

View file

@ -25,8 +25,7 @@
try { try {
if (previousOnLoad) previousOnLoad(); if (previousOnLoad) previousOnLoad();
} catch(e) {} } catch(e) {}
var config = angularJsConfig(document); angular.scenario.setUpAndRun({});
if (config.autotest) angular.scenario.setUpAndRun(config);
}; };
addCSS("../../css/angular-scenario.css"); addCSS("../../css/angular-scenario.css");