Merge pull request #669 from adaptlearning/issue/#663

Changed user preferences to be session based
adaptlearning · May 7, 2015 · fd8cb7a · fd8cb7a
2 parents 8494049 + 0323ed4
commit fd8cb7a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/frontend/src/core/app/views/originView.js b/frontend/src/core/app/views/originView.js
@@ -54,21 +54,19 @@ define(function(require){
     setUserPreference: function(key, value) {
       if (this.settings.preferencesKey && typeof(Storage) !== "undefined") {
         // Get preferences for this view
-        var preferences = localStorage.getItem(this.settings.preferencesKey);
-        // Convert string to JSON
-        var json = (JSON.parse(preferences) || {});
+        var preferences = (Origin.sessionModel.get(this.settings.preferencesKey) || {});
         // Set key and value
-        json[key] = value;
+        preferences[key] = value;
         // Store in localStorage
-        localStorage.setItem(this.settings.preferencesKey, JSON.stringify(json));
+        Origin.sessionModel.set(this.settings.preferencesKey, preferences);
 
       }
     },
 
     getUserPreferences: function() {
       if (this.settings.preferencesKey && typeof(Storage) !== "undefined"
         && localStorage.getItem(this.settings.preferencesKey)) {
-        return JSON.parse(localStorage.getItem(this.settings.preferencesKey));
+        return Origin.sessionModel.get(this.settings.preferencesKey);
       } else {
         return {};
       }