daemon2: unbreak spawn interval

[tt-rss.git] / tt-rss.js

diff --git a/tt-rss.js b/tt-rss.js
index 5d62fb25be081416461411d42eda56e48d16f6c3..36aec2f8f407df7cce866d318c0a5c8d995ea536 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -332,6 +332,14 @@ function updateTitle(s) {
                tmp = tmp + " > " + active_title_text;
        }
 
+       if (window.fluid) {
+               if (global_unread > 0) {
+                       window.fluid.dockBadge = global_unread;
+               } else {
+                       window.fluid.dockBadge = "";
+               }
+       }
+
        document.title = tmp;
 }
 
@@ -416,7 +424,7 @@ function resize_headlines(delta_x, delta_y) {
                                4) + "px";
                        resize_grab.style.display = "block";
 
-                       resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
+                       //resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
                        resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
        
                } else {
@@ -534,8 +542,7 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcAddFeed") {
-                       displayDlg('quickAddFeed', '',
-                                          function () {$('feed_url').focus();});
+                       quickAddFeed();
                        return;
                }
 
@@ -606,6 +613,18 @@ function quickMenuGo(opid) {
                        resize_headlines();
                }
 
+               if (opid == "qmcToggleReorder") {
+                       feedlist_sortable_enabled = !feedlist_sortable_enabled;
+
+                       if (feedlist_sortable_enabled) {
+                               notify_info("Category reordering enabled");
+                               toggle_sortable_feedlist(true);
+                       } else {
+                               notify_info("Category reordering disabled");
+                               toggle_sortable_feedlist(false);
+                       }
+               }
+
                if (opid == "qmcResetCats") {
 
                        if (confirm(__("Reset category order?"))) {
@@ -627,27 +646,6 @@ function quickMenuGo(opid) {
        }
 }
 
-function unsubscribeFeed(feed_id, title) {
-
-
-       var msg = __("Unsubscribe from %s?").replace("%s", title);
-
-       if (title == undefined || confirm(msg)) {
-               notify_progress("Removing feed...");
-
-               var query = "?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       dlg_frefresh_callback(transport, feed_id);
-                               } });
-       }
-
-       return false;
-}
-
-
 function updateFeedTitle(t) {
        active_title_text = t;
        updateTitle();
@@ -791,6 +789,7 @@ function editFeedDlg(feed) {
                        parameters: query,
                        onComplete: function(transport) { 
                                infobox_callback2(transport); 
+                               document.forms["edit_feed_form"].title.focus();
                        } });
 
        } catch (e) {
@@ -1236,9 +1235,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 83) { // s
-                               displayDlg('quickAddFeed', '',
-                                          function () {$('feed_url').focus();});
-
+                               quickAddFeed();
                                return false;
                        }
 
@@ -1266,6 +1263,10 @@ function hotkey_handler(e) {
                                return;
                        }
 
+                       if (keycode == 88) { // x
+                               reverseHeadlineOrder();
+                               return;
+                       }
                }
 
                /* Prefix c */
@@ -1379,3 +1380,19 @@ function feedsSortByUnread() {
 function inPreferences() {
        return false;
 }
+
+function reverseHeadlineOrder() {
+       try {
+
+               var query_str = "?op=rpc&subop=togglepref&key=REVERSE_HEADLINES";
+
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
+                       onComplete: function(transport) { 
+                                       viewCurrentFeed();
+                               } });
+
+       } catch (e) {
+               exception_error("reverseHeadlineOrder", e);
+       }
+}