diff options
| author | Vojta Jina | 2011-07-08 04:43:37 +0200 |
|---|---|---|
| committer | Igor Minar | 2011-07-13 16:21:07 -0700 |
| commit | 330d1a870dd81f8665b415f4acc104087156b989 (patch) | |
| tree | 2888ffa91ae4d3310908e5780b01c529492537e2 | |
| parent | 7e2e7b07b6a79a64891f3f2408fb6c325a499e51 (diff) | |
| download | angular.js-330d1a870dd81f8665b415f4acc104087156b989.tar.bz2 | |
fix(bootstrap): Fix bootstrap on IE<8
No reason for including ie-compat in bootstrap, it's included during angularInit.
Fix including ie-compat even for production.
| -rw-r--r-- | src/Angular.js | 2 | ||||
| -rw-r--r-- | src/angular-bootstrap.js | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Angular.js b/src/Angular.js index b5e7e12f..f28789d5 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -944,7 +944,7 @@ function angularInit(config, document){ if (config.css) $browser.addCss(config.base_url + config.css); else if(msie<8) - $browser.addJs(config.base_url + config.ie_compat, config.ie_compat_id); + $browser.addJs(config.ie_compat, config.ie_compat_id); } } diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js index b1140ec9..78f1e3c1 100644 --- a/src/angular-bootstrap.js +++ b/src/angular-bootstrap.js @@ -150,10 +150,12 @@ // empty the cache to prevent mem leaks globalVars = {}; - //angular-ie-compat.js needs to be pregenerated for development with IE<8 - if (msie<8) addScript('../angular-ie-compat.js'); + var config = angularJsConfig(document); - angularInit(angularJsConfig(document), document); + // angular-ie-compat.js needs to be pregenerated for development with IE<8 + config.ie_compat = serverPath + '../build/angular-ie-compat.js'; + + angularInit(config, document); } if (window.addEventListener){ |