kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-02 22:37:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(scenario): make browser().location() working if ng-app on other than <html>

Browse Source
This commit is contained in:
Vojta Jina
2012-04-14 10:39:24 -07:00
parent 499a76a08c
commit 5bcb749abb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ngScenario/Application.js
View File

@@ -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);
});
});
});

8
src/ngScenario/dsl.js
View File

@@ -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());
});
};