aboutsummaryrefslogtreecommitdiffstats
path: root/src/service/cookies.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/cookies.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/cookies.js')
-rw-r--r--src/service/cookies.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/service/cookies.js b/src/service/cookies.js
index a2ccee09..2cd2b9d6 100644
--- a/src/service/cookies.js
+++ b/src/service/cookies.js
@@ -13,9 +13,8 @@
*
* @example
*/
-angularServiceInject('$cookies', function($browser) {
- var rootScope = this,
- cookies = {},
+angularServiceInject('$cookies', function($rootScope, $browser) {
+ var cookies = {},
lastCookies = {},
lastBrowserCookies,
runEval = false;
@@ -27,7 +26,7 @@ angularServiceInject('$cookies', function($browser) {
lastBrowserCookies = currentCookies;
copy(currentCookies, lastCookies);
copy(currentCookies, cookies);
- if (runEval) rootScope.$apply();
+ if (runEval) $rootScope.$apply();
}
})();
@@ -36,7 +35,7 @@ angularServiceInject('$cookies', function($browser) {
//at the end of each eval, push cookies
//TODO: this should happen before the "delayed" watches fire, because if some cookies are not
// strings or browser refuses to store some cookies, we update the model in the push fn.
- this.$watch(push);
+ $rootScope.$watch(push);
return cookies;
@@ -90,4 +89,4 @@ angularServiceInject('$cookies', function($browser) {
}
}
}
-}, ['$browser']);
+}, ['$rootScope', '$browser']);