Skip to content

Commit 330d1a8

Browse files
vojtajinaIgorMinar
authored andcommitted
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.
1 parent 7e2e7b0 commit 330d1a8

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/Angular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ function angularInit(config, document){
944944
if (config.css)
945945
$browser.addCss(config.base_url + config.css);
946946
else if(msie<8)
947-
$browser.addJs(config.base_url + config.ie_compat, config.ie_compat_id);
947+
$browser.addJs(config.ie_compat, config.ie_compat_id);
948948
}
949949
}
950950

src/angular-bootstrap.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,12 @@
150150
// empty the cache to prevent mem leaks
151151
globalVars = {};
152152

153-
//angular-ie-compat.js needs to be pregenerated for development with IE<8
154-
if (msie<8) addScript('../angular-ie-compat.js');
153+
var config = angularJsConfig(document);
155154

156-
angularInit(angularJsConfig(document), document);
155+
// angular-ie-compat.js needs to be pregenerated for development with IE<8
156+
config.ie_compat = serverPath + '../build/angular-ie-compat.js';
157+
158+
angularInit(config, document);
157159
}
158160

159161
if (window.addEventListener){

0 commit comments

Comments
 (0)