aboutsummaryrefslogtreecommitdiffstats
path: root/src/service/defer.js
diff options
context:
space:
mode:
authorMisko Hevery2011-10-17 16:56:56 -0700
committerMisko Hevery2011-11-14 16:39:31 -0800
commit48697a2b86dbb12ea8de64cc5fece7caf68b321e (patch)
tree1fa50659f0bb5de2640dea2a2e5bb5628f2bb14a /src/service/defer.js
parent93b777c916ccff243c5a6080bf5f39860ac7bf39 (diff)
downloadangular.js-48697a2b86dbb12ea8de64cc5fece7caf68b321e.tar.bz2
refactor(injector): turn scope into a service
- turn scope into a $rootScope service. - injector is now a starting point for creating angular application. - added inject() method which wraps jasmine its/beforeEach/afterEach, and which allows configuration and injection of services. - refactor tests to use inject() where possible BREAK: - removed angular.scope() method
Diffstat (limited to 'src/service/defer.js')
-rw-r--r--src/service/defer.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/service/defer.js b/src/service/defer.js
index 42f80d25..07c98065 100644
--- a/src/service/defer.js
+++ b/src/service/defer.js
@@ -28,12 +28,10 @@
* @param {*} deferId Token returned by the `$defer` function.
* @returns {boolean} Returns `true` if the task hasn't executed yet and was successfuly canceled.
*/
-angularServiceInject('$defer', function($browser) {
- var scope = this;
-
+angularServiceInject('$defer', function($rootScope, $browser) {
function defer(fn, delay) {
return $browser.defer(function() {
- scope.$apply(fn);
+ $rootScope.$apply(fn);
}, delay);
}
@@ -42,4 +40,4 @@ angularServiceInject('$defer', function($browser) {
};
return defer;
-}, ['$browser']);
+}, ['$rootScope', '$browser']);