fix(service): use $window/$windowProvider instead of window

fix(docs): update ngdocs on storage-local.js
angular-translate · Feb 8, 2015 · bfa7b7b · bfa7b7b
1 parent 8dcf3e2
commit bfa7b7b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/service/storage-local.js b/src/service/storage-local.js
@@ -4,6 +4,7 @@ angular.module('pascalprecht.translate')
  * @ngdoc object
  * @name pascalprecht.translate.$translateLocalStorage
  * @requires $window
+ * @requires $translateCookieStorage
  *
  * @description
  * Abstraction layer for localStorage. This service is used when telling angular-translate

diff --git a/src/service/translate.js b/src/service/translate.js
@@ -7,7 +7,7 @@
  * and similar to configure translation behavior directly inside of a module.
  *
  */
-angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY', function ($STORAGE_KEY) {
+angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY', '$windowProvider', function ($STORAGE_KEY, $windowProvider) {
 
   var $translationTable = {},
       $preferredLanguage,
@@ -38,7 +38,7 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
 
   // tries to determine the browsers language
   var getFirstBrowserLanguage = function () {
-    var nav = window.navigator,
+    var nav = $windowProvider.$get().navigator,
         browserLanguagePropertyKeys = ['language', 'browserLanguage', 'systemLanguage', 'userLanguage'],
         i,
         language;

diff --git a/test/unit/service/storage-local.spec.js b/test/unit/service/storage-local.spec.js
@@ -1,13 +1,17 @@
 describe('pascalprecht.translate', function () {
 
+  var $translateLocalStorage, $window;
+
   describe('$translateLocalStorage', function () {
 
     beforeEach(module('pascalprecht.translate', 'ngCookies'));
 
-    var $translateLocalStorage;
 
-    beforeEach(inject(function (_$translateLocalStorage_) {
+
+    beforeEach(inject(function (_$translateLocalStorage_, _$window_) {
+    //beforeEach(inject(function (_$translateLocalStorage_) {
       $translateLocalStorage = _$translateLocalStorage_;
+      $window = _$window_;
     }));
 
     it('should be defined', function () {
@@ -44,7 +48,7 @@ describe('pascalprecht.translate', function () {
 
     beforeEach(module('pascalprecht.translate', 'ngCookies', function ($translateProvider) {
       // ensure that the local storage is cleared.
-      window.localStorage.clear();
+      $window.localStorage.clear();
       $translateProvider
         .translations('de_DE', {
           'EXISTING_TRANSLATION_ID': 'foo',
@@ -59,7 +63,7 @@ describe('pascalprecht.translate', function () {
     }));
 
     it('should use localstorage', function () {
-      inject(function ($window, $translate) {
+      inject(function ($translate) {
         expect($translate.storage().get($translate.storageKey())).toEqual('de_DE');
       });
     });