aboutsummaryrefslogtreecommitdiffstats
path: root/src/ngScenario
diff options
context:
space:
mode:
authorIgor Minar2013-04-12 23:24:45 -0700
committerIgor Minar2013-04-13 00:42:51 -0700
commitab755a25f9ca3f3f000623071d8de3ddc4b1d78e (patch)
treeed219805c0ce0e0df75ba6a439e193db340682bb /src/ngScenario
parentb7b08eed027b9e02bbd8757d426c124a002b27b5 (diff)
downloadangular.js-ab755a25f9ca3f3f000623071d8de3ddc4b1d78e.tar.bz2
fix(Scenario): correct bootstrap issue on IE
we need to set the deferred bootstrap flag via window.name after the iframe's src has been set, otherwise IE will reset it to empty string
Diffstat (limited to 'src/ngScenario')
-rw-r--r--src/ngScenario/Application.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js
index f7ce28cb..94192b8f 100644
--- a/src/ngScenario/Application.js
+++ b/src/ngScenario/Application.js
@@ -63,8 +63,6 @@ angular.scenario.Application.prototype.navigateTo = function(url, loadFn, errorF
self.context.find('#test-frames').append('<iframe>');
frame = self.getFrame_();
- frame[0].contentWindow.name = "NG_DEFER_BOOTSTRAP!";
-
frame.load(function() {
frame.unbind();
try {
@@ -88,6 +86,9 @@ angular.scenario.Application.prototype.navigateTo = function(url, loadFn, errorF
errorFn(e);
}
}).attr('src', url);
+
+ // for IE compatibility set the name *after* setting the frame url
+ frame[0].contentWindow.name = "NG_DEFER_BOOTSTRAP!";
}
self.context.find('> h2 a').attr('href', url).text(url);
};