diff options
| author | Vojta Jina | 2012-04-14 10:39:24 -0700 |
|---|---|---|
| committer | Vojta Jina | 2012-05-05 03:30:28 +0200 |
| commit | 5bcb749abb91dba0847cb9bc900777a67fd55aa8 (patch) | |
| tree | 8b7d68b117b15965fdbfa508e35c2a6bddec2fb5 | |
| parent | 499a76a08cc7a7604dab5e1dd9cca675b8e29333 (diff) | |
| download | angular.js-5bcb749abb91dba0847cb9bc900777a67fd55aa8.tar.bz2 | |
fix(scenario): make browser().location() working if ng-app on other than <html>
| -rw-r--r-- | src/ngScenario/Application.js | 8 | ||||
| -rw-r--r-- | src/ngScenario/dsl.js | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js index 1fdf3eb8..2ca6c8fd 100644 --- a/src/ngScenario/Application.js +++ b/src/ngScenario/Application.js @@ -92,9 +92,15 @@ angular.scenario.Application.prototype.executeAction = function(action) { } angularInit($window.document, function(element) { var $injector = $window.angular.element(element).injector(); + var $element = _jQuery(element); + + $element.injector = function() { + return $injector; + }; + $injector.invoke(function($browser){ $browser.notifyWhenNoOutstandingRequests(function() { - action.call(self, $window, _jQuery($window.document)); + action.call(self, $window, $element); }); }); }); diff --git a/src/ngScenario/dsl.js b/src/ngScenario/dsl.js index 6f3a3c73..d5fc1438 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.element($window.document).injector().get('$location').url()); + done(null, $document.injector().get('$location').url()); }); }; api.path = function() { return this.addFutureAction('$location.path()', function($window, $document, done) { - done(null, $window.angular.element($window.document).injector().get('$location').path()); + done(null, $document.injector().get('$location').path()); }); }; api.search = function() { return this.addFutureAction('$location.search()', function($window, $document, done) { - done(null, $window.angular.element($window.document).injector().get('$location').search()); + done(null, $document.injector().get('$location').search()); }); }; api.hash = function() { return this.addFutureAction('$location.hash()', function($window, $document, done) { - done(null, $window.angular.element($window.document).injector().get('$location').hash()); + done(null, $document.injector().get('$location').hash()); }); }; |