aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ngScenario/Application.js3
-rw-r--r--src/ngScenario/dsl.js8
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js
index d3a70569..1fdf3eb8 100644
--- a/src/ngScenario/Application.js
+++ b/src/ngScenario/Application.js
@@ -91,8 +91,7 @@ angular.scenario.Application.prototype.executeAction = function(action) {
return action.call(this, $window, _jQuery($window.document));
}
angularInit($window.document, function(element) {
- element = $window.angular.element(element);
- var $injector = element.inheritedData('$injector');
+ var $injector = $window.angular.element(element).injector();
$injector.invoke(function($browser){
$browser.notifyWhenNoOutstandingRequests(function() {
action.call(self, $window, _jQuery($window.document));
diff --git a/src/ngScenario/dsl.js b/src/ngScenario/dsl.js
index 7ca33a26..6f3a3c73 100644
--- a/src/ngScenario/dsl.js
+++ b/src/ngScenario/dsl.js
@@ -103,25 +103,25 @@ angular.scenario.dsl('browser', function() {
api.url = function() {
return this.addFutureAction('$location.url()', function($window, $document, done) {
- done(null, $window.angular.injector(['ng']).get('$location').url());
+ done(null, $window.angular.element($window.document).injector().get('$location').url());
});
};
api.path = function() {
return this.addFutureAction('$location.path()', function($window, $document, done) {
- done(null, $window.angular.injector(['ng']).get('$location').path());
+ done(null, $window.angular.element($window.document).injector().get('$location').path());
});
};
api.search = function() {
return this.addFutureAction('$location.search()', function($window, $document, done) {
- done(null, $window.angular.injector(['ng']).get('$location').search());
+ done(null, $window.angular.element($window.document).injector().get('$location').search());
});
};
api.hash = function() {
return this.addFutureAction('$location.hash()', function($window, $document, done) {
- done(null, $window.angular.injector(['ng']).get('$location').hash());
+ done(null, $window.angular.element($window.document).injector().get('$location').hash());
});
};