version bump

CHANGELOG.md

@@ -1,3 +1,6 @@
+owncloud-news (3.404)
+* **Bugfix**: Fix freeze when a folder is selected, the previous folder has 0 visible subfeeds and the **d** shortcut is pressed to jump the the previous feed
+
 owncloud-news (3.403)
 * **Bugfix**: Use correct route for python updater
 

appinfo/app.json

@@ -3,7 +3,7 @@
     "id": "news",
     "description": "An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory",
     "licence": "AGPL",
-    "version": "3.4.3",
+    "version": "3.4.4",
     "authors": [
         {
             "name": "Bernhard Posselt",

appinfo/info.xml

@@ -5,6 +5,6 @@
 	<description>An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory</description>
 	<licence>AGPL</licence>
 	<author>Bernhard Posselt, Alessandro Cosentino, Jan-Christoph Borchardt</author>
-	<version>3.403</version>
+	<version>3.404</version>
 	<require>7.0.3</require>
 </info>

appinfo/version

@@ -1 +1 @@
-3.403
+3.404

js/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ownCloud-news",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "homepage": "https://github.com/owncloud/news",
   "authors": [
     "Bernhard Posselt <[email protected]>"

js/build/app.js

@@ -1809,18 +1809,31 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL)
                                            '.starred-feed:visible,' +
                                            '.feed:visible');
 
+        // special case: folder selected
         if (current.hasClass('folder')) {
-            current = current.prev('.folder');
-            while (current.length > 0) {
-                var subfeeds = current.find('.feed:visible');
+            var previousFolder = current.prev('.folder');
+
+            while (previousFolder.length > 0) {
+                var subfeeds = previousFolder.find('.feed:visible');
                 if (subfeeds.length > 0) {
                     $(subfeeds[subfeeds.length-1])
                         .children('a:visible').trigger('click');
                     return;
                 }
+                previousFolder = previousFolder.prev('.folder');
             }
 
-            // no subfeed found
+            // no subfeed found try visible feeds
+            var feeds = current.siblings('.feed');
+
+            if (feeds.length > 0) {
+                (feeds[feeds.length-1])
+                    .children('a:visible').trigger('click');
+                return;
+            }
+
+
+            // no feed found, go to starred
             var starred = $('.starred-feed:visible');
             if (starred.length > 0) {
                 starred.children('a:visible').trigger('click');

js/gui/KeyboardShortcuts.js

@@ -78,18 +78,31 @@
                                            '.starred-feed:visible,' +
                                            '.feed:visible');
 
+        // special case: folder selected
         if (current.hasClass('folder')) {
-            current = current.prev('.folder');
-            while (current.length > 0) {
-                var subfeeds = current.find('.feed:visible');
+            var previousFolder = current.prev('.folder');
+
+            while (previousFolder.length > 0) {
+                var subfeeds = previousFolder.find('.feed:visible');
                 if (subfeeds.length > 0) {
                     $(subfeeds[subfeeds.length-1])
                         .children('a:visible').trigger('click');
                     return;
                 }
+                previousFolder = previousFolder.prev('.folder');
             }
 
-            // no subfeed found
+            // no subfeed found try visible feeds
+            var feeds = current.siblings('.feed');
+
+            if (feeds.length > 0) {
+                (feeds[feeds.length-1])
+                    .children('a:visible').trigger('click');
+                return;
+            }
+
+
+            // no feed found, go to starred
             var starred = $('.starred-feed:visible');
             if (starred.length > 0) {
                 starred.children('a:visible').trigger('click');

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ownCloud-news",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "description": "An RSS/Atom feed reader",
   "main": "build/app.js",
   "scripts": {