Merge pull request #267 from Wikia/fixes

Fixes
Wikia · Nov 21, 2017 · 4fa9b9a · 4fa9b9a
2 parents be371eb + a3b50b0
commit 4fa9b9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/components/recirculation-prefooter.js b/app/components/recirculation-prefooter.js
@@ -1,3 +1,4 @@
+import fetch from 'fetch';
 import {inject as service} from '@ember/service';
 import Component from '@ember/component';
 import {computed} from '@ember/object';

diff --git a/app/mixins/image-loader.js b/app/mixins/image-loader.js
@@ -1,4 +1,5 @@
 import Mixin from '@ember/object/mixin';
+import {Promise} from 'rsvp';
 
 export default Mixin.create({
 	/**

diff --git a/app/models/wikia-in-your-lang.js b/app/models/wikia-in-your-lang.js
@@ -20,11 +20,12 @@ function getCacheKey(lang) {
  */
 function getFromCache(browserLang) {
 	const key = getCacheKey(browserLang),
-		value = JSON.parse(localStorageConnector.getItem(key)),
+		valueJson = localStorageConnector.getItem(key) || '{}',
+		value = JSON.parse(valueJson),
 		now = new Date().getTime();
 
 	// we cache for 30 days (2592000000)
-	if (!value || now - value.timestamp > 2592000000) {
+	if (!value.model || now - value.timestamp > 2592000000) {
 		return null;
 	}