rename settings model

mboinet · May 25, 2013 · 823b824 · 823b824
1 parent 54de540
commit 823b824
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/scripts/api.js b/src/scripts/api.js
@@ -68,8 +68,8 @@ define(['require','jquery','conf','router','models','utils'],
 
           } else {
             // SINGLE_USER_MODE
-            require('models').settingsModel.set("sid", data.content.session_id);
-            require('models').settingsModel.save();
+            require('models').settings.set("sid", data.content.session_id);
+            require('models').settings.save();
 
             window.location.reload(true);
           }
@@ -91,7 +91,7 @@ define(['require','jquery','conf','router','models','utils'],
     ttRssApiCall: function(req, success, async){
       var data = req;
       // circular dependency for models
-      var sid = require('models').settingsModel.get("sid");
+      var sid = require('models').settings.get("sid");
 
       if (sid != undefined){
         data.sid = sid;

diff --git a/src/scripts/main.js b/src/scripts/main.js
@@ -58,8 +58,8 @@ requirejs(['jquery','backbone','conf','router','api','utils','models'],
       .done(function(data){
         if (data.status == 0){
           // we store the sessions id
-          models.settingsModel.set("sid", data.content.session_id);
-          models.settingsModel.save();
+          models.settings.set("sid", data.content.session_id);
+          models.settings.save();
 
           router.myRouter.setNextTransOptions({reverse: true, transition: "slideup"});
 

diff --git a/src/scripts/models.js b/src/scripts/models.js
@@ -403,7 +403,7 @@ define(['api','backbone','utils'],
     feedsModel: feedsModel,
     articlesModel: articlesModel,
     configModel: new ConfigModel(),
-    settingsModel: settings,
+    settings: settings,
     article: ArticleModel
 
   }

diff --git a/src/scripts/views.js b/src/scripts/views.js
@@ -124,7 +124,7 @@ define(['jquery', 'models', 'templates','conf','utils'],
 
         var msg = "No categories";
 
-        if (models.settingsModel.get("onlyUnread")){
+        if (models.settings.get("onlyUnread")){
           msg = "No unread categories";
         }
 
@@ -397,7 +397,7 @@ define(['jquery', 'models', 'templates','conf','utils'],
 
         var msg = "No feeds";
 
-        if (models.settingsModel.get("onlyUnread")){
+        if (models.settings.get("onlyUnread")){
           msg = "No unread feeds";
         }
 
@@ -651,7 +651,7 @@ define(['jquery', 'models', 'templates','conf','utils'],
         // no elements in the collection
 
         // message depending on options
-        var msg = models.settingsModel.get("onlyUnread") ?
+        var msg = models.settings.get("onlyUnread") ?
           "No unread articles" :"No articles" ;
 
         this.$lv.html(tpl.roListElement({text: msg}));
@@ -1095,7 +1095,7 @@ define(['jquery', 'models', 'templates','conf','utils'],
 
     initialize: function(){
       // bind the view to the model
-      this.model = models.settingsModel;
+      this.model = models.settings;
 
       // load settings from localStorage & update values
       this.model.fetch();