Bug fixes

Fixed content source toggle bug Fixed refreshing of settings, history, bookmarks and feeds Fixed missing icon image from delete modal
CptFoobar · Dec 6, 2015 · a2dad8a · a2dad8a
1 parent 57544d3
commit a2dad8a
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ List of targets for v1:
 * Home
     - ~~Clock~~
     - ~~Greeting~~
-    - Weather
+    - ~~(moved to v2) Weather~~
     - ~~Nav~~
 
 
@@ -33,8 +33,8 @@ List of targets for v1:
 * Settings Options
     - ~~_Greeting_ : Show greeting~~
     - ~~_Name_ : Input user name for greeting~~
-    - _Location_ : Use automatic/manual location  
-    - _Weather_ : C/F
+    - ~~(X) _Location_ : Use automatic/manual location~~
+    - ~~_(X) Weather_ : C/F~~
     - ~~(X) _Theme_ : Set dark/light theme~~
     - ~~_Feed content_ :~~
         ~~<-- Latest only -- Latest > Trending -- Balanced -- Trending > Latest -- Trending only -->~~
@@ -52,8 +52,8 @@ List of targets for v1:
 
 * Other Views
     - ~~_Help_ : How to use Blink~~
-    - _About_ : About Blink (ahem, and me)
-    - _Support_: $$$ = <3
+    - ~~_About_ : About Blink (ahem, and me)~~
+    - ~~_Support_: $$$ = <3~~
 
 * Misc
-    - [Isotope and packery](http://desandro.com/masonry)
+    - ~~(moved to v2) [Isotope and packery](http://desandro.com/masonry)~~
diff --git a/data/js/MigrationHandler.js b/data/js/MigrationHandler.js
@@ -12,7 +12,6 @@ var parseFeedSource = function(json, wanted) {
                         sourceObject.deliciousTags : [],
         wanted: wanted
     };
-    //console.log("parsed: " + JSON.stringify(parsedSource));
     return parsedSource;
 };
 
@@ -23,7 +22,6 @@ const migrate = function(oldPrefs) {
     var searchUrlPrefix = "https://cloud.feedly.com/v3/search/feeds?q=";
     for (let i = 0; i < oldPrefs.length; i++) {
         let url = searchUrlPrefix + oldPrefs[i].link;
-        console.log("url is: " + url);
         Request({
             url: url,
             onComplete: function(response) {

diff --git a/data/js/bookmarksManager.js b/data/js/bookmarksManager.js
@@ -5,10 +5,7 @@
     self.port.on("bookmarks", function(bookmarksTree) {
         bookmarks = bookmarksTree;
     });
-    // If bookmarks is empty, ping the add-on process to get it
-    if (bookmarks.length == 0)
-        self.port.emit("getBookmarks", {});
-
+
     /* Wrapper for fetching all bookmarks */
     var fetchBookmarks = function(timeout) {
         // Wait for `timeout` secs before declaring 'fetch failure'
@@ -38,6 +35,8 @@
             var intent = message.intent;
             switch (intent) {
                 case "fetch":
+                    bookmarks = [];
+                    self.port.emit("getBookmarks", {});
                     fetchBookmarks(3);
                     break;
             }

diff --git a/data/js/contentManager.js b/data/js/contentManager.js
@@ -5,10 +5,7 @@
     self.port.on("contentList", function(content) {
         contentList = content;
     });
-    // If contentList is empty, ping the add-on process to get it
-    if (contentList.length == 0)
-        self.port.emit("getContentList", {});
-
+
     // FIXME: DRY in managers
     // The code below this line (fetchcontentList and the window listener)
     // is being repeated in every *Manager.js file. Maybe we can move this
@@ -62,6 +59,10 @@
         self.port.emit("deleteSourceItem", item);
     }
 
+    var toggleSourceItem = function(item) {
+        self.port.emit("toggleSourceItem", item);
+    }
+
     /* Listen for window message events, and process accordingly. */
     window.addEventListener('message', function(event) {
         var message = JSON.parse(event.data);
@@ -71,6 +72,8 @@
             switch (intent) {
                 case "fetch":
                     console.log("fetch request");
+                    contentList = [];
+                    self.port.emit("getContentList", {});
                     fetchContentList(3);
                     break;
                 case "search":
@@ -85,6 +88,10 @@
                     console.log("delete request");
                     deleteSourceItem(message.payload.removeItem);
                     break;
+                case "toggle":
+                    console.log("toggle request");
+                    toggleSourceItem(message.payload.toggleItem)
+                    break;
             }
         }
     }, false);

diff --git a/data/js/controllers/ContentController.js b/data/js/controllers/ContentController.js
@@ -16,9 +16,19 @@
             $scope.alerts.splice(index, 1);
         };
 
-        $scope.updatePrefs = function(msg) {
-            console.log('toggled ' + msg);
-        }
+        $scope.updatePrefs = function(item) {
+            console.log("toggling " + item.title);
+            $scope.$emit(
+                '$messageOutgoing',
+                angular.toJson({
+                    target: "ContentManager",
+                    intent: "toggle",
+                    payload: {
+                        toggleItem: item
+                    }
+                })
+            );
+        };
 
         $scope.deleteItem = function(item) {
             console.log('deleting ' + JSON.stringify(item));
@@ -98,8 +108,8 @@
         };
 
 
-        $scope.promptDelete = function(idToDelete) {
-
+        $scope.promptDelete = function(item) {
+            var idToDelete = indexOf(item);
             var modalInstance = $uibModal.open({
                 animation: true,
                 templateUrl: 'confirmDelete.html',

diff --git a/data/js/feedHandler.js b/data/js/feedHandler.js
@@ -29,7 +29,8 @@
         // 'Load More' loader)
         console.log("fetching streams...");
         for (i = 0; i < feedList.length; i++) {
-            fetchById(feedList[i], streamUrlPrefix, count);
+            if (feedList[i].wanted)
+                fetchById(feedList[i], streamUrlPrefix, count);
         }
     };
 
@@ -40,7 +41,8 @@
         // 'Load More' loader)
         console.log("fetching trends...");
         for (i = 0; i < feedList.length; i++) {
-            fetchById(feedList[i], trendingUrlPrefix, count);
+            if (feedList[i].wanted)
+                fetchById(feedList[i], trendingUrlPrefix, count);
         }
     };
 

diff --git a/data/js/feedManager.js b/data/js/feedManager.js
@@ -16,10 +16,6 @@
         else feedRatio = 1;
     });
 
-    // If feedList is empty, ping the add-on process to get it
-    if(feedList.length == 0)
-        self.port.emit("getFeed", {});
-
     /* Wrapper for fetching all feed */
     var fetchAllFeed = function(timeout) {
         // Wait for `timeout` secs before declaring 'fetch failure'
@@ -47,6 +43,8 @@
             switch (intent) {
                 case "fetch":
                     feedRatio = -1;
+                    feedList = [];
+                    self.port.emit("getFeed", {});
                     self.port.emit("getFeedConfig", {});
                     fetchAllFeed(4);
                     break;

diff --git a/data/js/historyManager.js b/data/js/historyManager.js
@@ -10,10 +10,6 @@
         history = recents;
     });
 
-    // If history is empty, ping the add-on process to get it
-    if (history.length === 0)
-        self.port.emit("getHistory", {});
-
     /* Wrapper for fetching all history */
     var fetchHistory = function(timeout) {
         // Wait for `timeout` secs before declaring 'fetch failure'
@@ -75,6 +71,8 @@
             var intent = message.intent;
             switch (intent) {
                 case "fetch":
+                    history = [];
+                    self.port.emit("getHistory", {});
                     fetchHistory(3);
                     break;
             }

diff --git a/data/js/settingsManager.js b/data/js/settingsManager.js
@@ -6,10 +6,6 @@
         userSettings = content;
     });
 
-    // If userSettings is empty, ping the add-on process to get it
-    if (userSettings.length == 0)
-        self.port.emit("getUserSettings", {});
-
     /* Wrapper for fetching all userSettings */
     var fetchUserSettings = function(timeout) {
         // Wait for `timeout` secs before declaring 'fetch failure'
@@ -46,6 +42,8 @@
             switch (intent) {
                 case "getConfig":
                     console.log("fetch user settings request");
+                    userSettings = [];
+                    self.port.emit("getUserSettings", {});
                     fetchUserSettings(3);
                     break;
                 case "saveConfig":

diff --git a/data/markup/content.html b/data/markup/content.html
@@ -29,7 +29,7 @@
 <script type="text/ng-template" id="confirmDelete.html">
     <div class="modal-header">
         <span class="modal-title delete-confirm-title"> Delete {{ toDelete.title }} ?
-            <img ng-src="{{ toDelete.image }}" class="src-img"/>
+            <img ng-src="{{ toDelete.icon }}" class="src-img"/>
             </span>
     </div>
     <div class="modal-body delete-confirm-body">
@@ -79,10 +79,10 @@
         <div class="column col-xs-8 col-sm-3 col-md-2 col-md-push-1 content-wrapper" ng-repeat="i in [] | range:getColumns()">
             <div class="item-container noselect" ng-repeat="src in items | orderBy:'title'" ng-if="$index % getColumns() === i">
                 <span>
-                    <h5><span class="delete-button" ng-click="promptDelete($index)"><i class="fa fa-trash fa-fw fa-lg"></i></span></h5>
+                    <h5><span class="delete-button" ng-click="promptDelete(src)"><i class="fa fa-trash fa-fw fa-lg"></i></span></h5>
                 <img ng-src="{{ src.icon }}" class="feed-icon" />
                 <p class="text-center">
-                    <input type="checkbox" style="vertical-align: text-top;" ng-model="src.wanted" ng-click="updatePrefs(src.wanted)">
+                    <input type="checkbox" style="vertical-align: text-top;" ng-model="src.wanted" ng-click="updatePrefs(src)">
                     <a ng-href="{{ src.websiteUrl }}">{{ src.title }}</a>
                 </p>
                 </span>

diff --git a/index.js b/index.js
@@ -178,6 +178,13 @@ function setPageMods() {
                     updateFeed();
                 }
             });
+            worker.port.on("toggleSourceItem", function(item) {
+                var index = indexOf(item);
+                if (index >= 0) {
+                    feedList[index].wanted = !feedList[index].wanted;
+                    updateFeed();
+                }
+            });
         }
     }));
 
@@ -202,7 +209,6 @@ function setPageMods() {
 function initConfig() {
     if (self.loadReason == "install" || self.loadReason == "upgrade"
             || !ss.storage.feedList) {
-        //makeFeed();
         userSettings = {
             showGreeting: true,
             userName: "Emma",
@@ -214,53 +220,7 @@ function initConfig() {
         userSettings = ss.storage.userSettings;
     }
 
-    ss.storage.feedprefs = [{
-					"name" : "TechCrunch",
-					"link" : "http://feeds.feedburner.com/Techcrunch",
-					"wanted" : true
-				 },
-				 {
-					"name" : "Gizmodo",
-					"link" : "http://feeds.gawker.com/gizmodo/full",
-					"wanted" : true
-				 },
-				 {
-					"name" : "Engadget",
-					"link" : "http://www.engadget.com/rss.xml",
-					"wanted" : true
-				 },
-				 {
-					"name" : "LifeHacker",
-					"link" : "http://feeds.gawker.com/lifehacker/vip",
-					"wanted" : true
-				 },
-				 {
-					"name" : "The Verge",
-					"link" : "http://www.theverge.com/rss/index.xml",
-					"wanted" : true
-				 },
-				 {
-					"name" : "Mashable",
-					"link" : "http://feeds.mashable.com/mashable/tech",
-					"wanted" : false
-				 },
-				 {
-					"name" : "Wired",
-					"link" : "http://feeds.wired.com/wired/index",
-					"wanted" : true
-				 },
-				 {
-					"name" : "The Next Web",
-					"link" : "http://thenextweb.com/feed/",
-					"wanted" : false
-                 },{
-					"name" : "// TODO",
-					"link" : "http://blog.championswimmer.in/feed.xml",
-					"wanted" : true
-				 }];
-
-    //if (self.loadReason == "upgrade") {
-    if(true) {
+    if (self.loadReason == "upgrade") {
         feedList = MigrationHandler.migrate(ss.storage.feedprefs);
         updateFeed();
         delete ss.storage.feedprefs;
@@ -324,7 +284,7 @@ function updateFeed() {
 function updateUserSettings(newSettings) {
     ss.storage.userSettings = newSettings;
     userSettings = newSettings;
-    console.log("updated. new settings are: " + JSON.stringify(userSettings));
+    Log("updated. new settings are: " + JSON.stringify(userSettings));
 }
 
 /* fetch bookmarks */