]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
prefs: some async work (2)
[tt-rss.git] / prefs.js
index cc3733a653ab9f33a95bc86482cb16a2eaed168b..e05de8c8878e9d73e1d395521f1ad82a42cedbc1 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -2,7 +2,6 @@ var xmlhttp = false;
 
 var active_feed_cat = false;
 var active_tab = false;
-var feed_to_expand = false;
 
 var xmlhttp = Ajax.getTransport();
 
@@ -54,51 +53,14 @@ function replace_pubkey_callback() {
        }
 }
 
-function expand_feed_callback() {
-       if (xmlhttp.readyState == 4) {
-               try {   
-                       var container = document.getElementById("BRDET-" + feed_to_expand);     
-                       container.innerHTML=xmlhttp.responseText;
-//                     container.style.display = "block";
-                       Effect.Appear(container, {duration : 0.5});
-               } catch (e) {
-                       exception_error("expand_feed_callback", e);
-               }
-       }
-}
-
 function feedlist_callback() {
        if (xmlhttp.readyState == 4) {
-               try {   
-                       var container = document.getElementById('prefContent'); 
-                       container.innerHTML=xmlhttp.responseText;
-                       selectTab("feedConfig", true);
-
-                       if (caller_subop) {
-                               var tuple = caller_subop.split(":");
-                               if (tuple[0] == 'editFeed') {
-                                       window.setTimeout('editFeed('+tuple[1]+')', 100);
-                               }                               
-
-                               caller_subop = false;
-                       }
-                       if (typeof correctPNG != 'undefined') {
-                               correctPNG();
-                       }
-                       notify("");
-                       remove_splash();
-
-               } catch (e) {
-                       exception_error("feedlist_callback", e);
-               }
+               return feedlist_callback2(xmlhttp);
        }
 }
 
-/* stub for subscription dialog */
-
-function dlg_frefresh_callback(transport) {
-
-       try {
+function feedlist_callback2(transport) {
+       try {   
                var container = document.getElementById('prefContent'); 
                container.innerHTML=transport.responseText;
                selectTab("feedConfig", true);
@@ -115,10 +77,17 @@ function dlg_frefresh_callback(transport) {
                        correctPNG();
                }
                notify("");
+               remove_splash();
+
        } catch (e) {
-               exception_error("feedlist_callback", e);
+               exception_error("feedlist_callback2", e);
        }
+}
+
+/* stub for subscription dialog */
 
+function dlg_frefresh_callback(transport) {
+       return feedlist_callback2(transport);
 }
 
 function filterlist_callback() {
@@ -133,14 +102,13 @@ function filterlist_callback() {
        }
 }
 
-function labellist_callback() {
+function labellist_callback2(transport) {
 
        try {
 
                var container = document.getElementById('prefContent');
-               if (xmlhttp.readyState == 4) {
                        closeInfoBox();
-                       container.innerHTML=xmlhttp.responseText;
+                       container.innerHTML=transport.responseText;
        
                        if (document.getElementById("prefLabelList")) {
                                var elems = document.getElementById("prefLabelList").getElementsByTagName("SPAN");
@@ -161,10 +129,9 @@ function labellist_callback() {
                        }
                        notify("");
                        remove_splash();
-               }
 
        } catch (e) {
-               exception_error("labellist_callback", e);
+               exception_error("labellist_callback2", e);
        }
 }
 
@@ -239,28 +206,32 @@ function changepass_callback() {
        }
 }
 
-function infobox_feed_cat_callback() {
-       if (xmlhttp.readyState == 4) {
-               try {
-
-                       infobox_callback();
-
-                       if (document.getElementById("prefFeedCatList")) {
-                               var elems = document.getElementById("prefFeedCatList").getElementsByTagName("SPAN");
+function init_cat_inline_editor() {
+       try {
 
-                               for (var i = 0; i < elems.length; i++) {
-                                       if (elems[i].id && elems[i].id.match("FCATT-")) {
-                                               var cat_id = elems[i].id.replace("FCATT-", "");
+               if (document.getElementById("prefFeedCatList")) {
+                       var elems = document.getElementById("prefFeedCatList").getElementsByTagName("SPAN");
 
+                       for (var i = 0; i < elems.length; i++) {
+                               if (elems[i].id && elems[i].id.match("FCATT-")) {
+                                       var cat_id = elems[i].id.replace("FCATT-", "");
                                                new Ajax.InPlaceEditor(elems[i],
-                                                       'backend.php?op=pref-feeds&subop=editCats&action=save&cid=' + cat_id);
-                                       }
+                                               'backend.php?op=pref-feeds&subop=editCats&action=save&cid=' + cat_id);
                                }
                        }
-
-               } catch (e) {
-                       exception_error("infobox_feed_cat_callback", e);
                }
+
+       } catch (e) {
+               exception_error("init_cat_inline_editor", e);
+       }
+}
+
+function infobox_feed_cat_callback2(transport) {
+       try {
+               infobox_callback2(transport);
+               init_cat_inline_editor();
+       } catch (e) {
+               exception_error("infobox_feed_cat_callback2", e);
        }
 }
 
@@ -314,30 +285,27 @@ function addLabel() {
 
        try {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       var caption = prompt(__("Please enter label caption:"), "");
-
-       if (caption == null) { 
-               return false;
-       }
-
-       if (caption == "") {
-               alert(__("Can't create label: missing caption."));
-               return false;
-       }
-
-       // we can be called from some other tab
-       active_tab = "labelConfig";
-
-       var query = "caption=" + param_escape(caption);
-
-       xmlhttp.open("GET", "backend.php?op=pref-labels&subop=add&" + query, true);                     
-       xmlhttp.onreadystatechange=infobox_submit_callback;
-       xmlhttp.send(null);
+               var caption = prompt(__("Please enter label caption:"), "");
+       
+               if (caption == null) { 
+                       return false;
+               }
+       
+               if (caption == "") {
+                       alert(__("Can't create label: missing caption."));
+                       return false;
+               }
+       
+               // we can be called from some other tab
+               active_tab = "labelConfig";
+       
+               query = "backend.php?op=pref-labels&subop=add&caption=" + 
+                       param_escape(caption);
+       
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       infobox_submit_callback2(transport);
+                               } });
 
        } catch (e) {
                exception_error("addLabel", e);
@@ -346,27 +314,31 @@ function addLabel() {
 
 function addFeed() {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       var link = document.getElementById("fadd_link");
-
-       if (link.value.length == 0) {
-               alert(__("Error: No feed URL given."));
-       } else if (!isValidURL(link.value)) {
-               alert(__("Error: Invalid feed URL."));
-       } else {
-               notify_progress("Adding feed...");
-
-               xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
-                       param_escape(link.value), true);
-               xmlhttp.onreadystatechange=feedlist_callback;
-               xmlhttp.send(null);
+       try {
 
-               link.value = "";
+               var link = document.getElementById("fadd_link");
+       
+               if (link.value.length == 0) {
+                       alert(__("Error: No feed URL given."));
+               } else if (!isValidURL(link.value)) {
+                       alert(__("Error: Invalid feed URL."));
+               } else {
+                       notify_progress("Adding feed...");
+       
+                       var query = "backend.php?op=pref-feeds&subop=add&from=tt-rss&feed_url=" +
+                               param_escape(link.value);
+       
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) {
+                                               feedlist_callback2(transport);
+                                       } });
+       
+                       link.value = "";
+       
+               }
 
+       } catch (e) {
+               exception_error("addFeed", e);
        }
 
 }
@@ -385,10 +357,13 @@ function addFeedCat() {
        } else {
                notify_progress("Adding feed category...");
 
-               xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats&action=add&cat=" +
-                       param_escape(cat.value), true);
-               xmlhttp.onreadystatechange=infobox_callback;
-               xmlhttp.send(null);
+               var query = "backend.php?op=pref-feeds&subop=editCats&action=add&cat=" +
+                       param_escape(cat.value);
+
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       infobox_feed_cat_callback2(transport);
+                               } });
 
                link.value = "";
 
@@ -422,97 +397,81 @@ function addUser() {
 
 function editUser(id) {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
+       try {
 
-       disableHotkeys();
+               disableHotkeys();
 
-       notify_progress("Loading, please wait...");
+               notify_progress("Loading, please wait...");
 
-       selectTableRowsByIdPrefix('prefUserList', 'UMRR-', 'UMCHK-', false);
-       selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
+               selectTableRowsByIdPrefix('prefUserList', 'UMRR-', 'UMCHK-', false);
+               selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
 
-       xmlhttp.open("GET", "backend.php?op=pref-users&subop=edit&id=" +
-               param_escape(id), true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
+               disableContainerChildren("userOpToolbar", false);
 
-}
+               var query = "backend.php?op=pref-users&subop=edit&id=" +
+                       param_escape(id);
 
-function editFilter(id) {
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       infobox_callback2(transport);
+                               } });
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
+       } catch (e) {
+               exception_error("editUser", e);
        }
-
-       disableHotkeys();
-
-       notify_progress("Loading, please wait...");
-
-//     document.getElementById("create_filter_btn").disabled = true;
-
-       selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
-       selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
-
-       xmlhttp.open("GET", "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id), true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
+               
 }
 
-function editFeed(feed) {
-
-//     notify("Editing feed...");
-
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       disableHotkeys();
-
-       notify_progress("Loading, please wait...");
-
-/*     document.getElementById("subscribe_to_feed_btn").disabled = true;
+function editFilter(id) {
 
        try {
-               document.getElementById("top25_feeds_btn").disabled = true;
-       } catch (e) {
-               // this button is not always available, no-op if not found
-       } */
 
-       // clean selection from all rows & select row being edited
-       selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
-       selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
+               disableHotkeys();
 
-       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editfeed&id=" +
-               param_escape(feed), true);
+               notify_progress("Loading, please wait...");
 
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
+               disableContainerChildren("filterOpToolbar", false);
 
-}
+               selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
+               selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
 
-function editFeedCat(cat) {
+               var query = "backend.php?op=pref-filters&subop=edit&id=" + 
+                       param_escape(id);
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       infobox_callback2(transport);
+                               } });
+       } catch (e) {
+               exception_error("editFilter", e);
        }
+}
 
-       disableHotkeys();
-
-       notify_progress("Loading, please wait...");
+function editFeed(feed) {
 
-       active_feed_cat = cat;
+       try {
 
-       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats&action=edit&id=" +
-               param_escape(cat), true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
+               disableHotkeys();
+       
+               notify_progress("Loading, please wait...");
+       
+               // clean selection from all rows & select row being edited
+               selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
+               selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
+       
+               disableContainerChildren("feedOpToolbar", false);
+       
+               var query = "backend.php?op=pref-feeds&subop=editfeed&id=" +
+                       param_escape(feed);
+       
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       infobox_callback2(transport);
+                               } });
 
+       } catch (e) {
+               exception_error("editFeed", e);
+       }
 }
 
 function getSelectedLabels() {
@@ -535,36 +494,9 @@ function getSelectedFeedCats() {
        return getSelectedTableRowIds("prefFeedCatList", "FCATR");
 }
 
-function getSelectedFeedsFromBrowser() {
-
-       var list = document.getElementById("browseFeedList");
-       if (!list) list = document.getElementById("browseBigFeedList");
-
-       var selected = new Array();
-       
-       for (i = 0; i < list.childNodes.length; i++) {
-               var child = list.childNodes[i];
-               if (child.id && child.id.match("FBROW-")) {
-                       var id = child.id.replace("FBROW-", "");
-                       
-                       var cb = document.getElementById("FBCHK-" + id);
-
-                       if (cb.checked) {
-                               selected.push(id);
-                       }
-               }
-       }
-
-       return selected;
-}
 
 function removeSelectedLabels() {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
        var sel_rows = getSelectedLabels();
 
        if (sel_rows.length > 0) {
@@ -574,10 +506,14 @@ function removeSelectedLabels() {
                if (ok) {
                        notify_progress("Removing selected labels...");
        
-                       xmlhttp.open("GET", "backend.php?op=pref-labels&subop=remove&ids="+
-                               param_escape(sel_rows.toString()), true);
-                       xmlhttp.onreadystatechange=labellist_callback;
-                       xmlhttp.send(null);
+                       var query = "backend.php?op=pref-labels&subop=remove&ids="+
+                               param_escape(sel_rows.toString());
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) {
+                                               labellist_callback2(transport);
+                                       } });
+
                }
        } else {
                alert(__("No labels are selected."));
@@ -646,31 +582,33 @@ function removeSelectedFilters() {
 
 function removeSelectedFeeds() {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       var sel_rows = getSelectedFeeds();
-
-       if (sel_rows.length > 0) {
-
-               var ok = confirm(__("Unsubscribe from selected feeds?"));
-
-               if (ok) {
+       try {
 
-                       notify_progress("Unsubscribing from selected feeds...");
+               var sel_rows = getSelectedFeeds();
        
-                       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids="+
-                               param_escape(sel_rows.toString()), true);
-                       xmlhttp.onreadystatechange=feedlist_callback;
-                       xmlhttp.send(null);
+               if (sel_rows.length > 0) {
+       
+                       var ok = confirm(__("Unsubscribe from selected feeds?"));
+       
+                       if (ok) {
+       
+                               notify_progress("Unsubscribing from selected feeds...");
+               
+                               var query = "backend.php?op=pref-feeds&subop=remove&ids="+
+                                       param_escape(sel_rows.toString());
+       
+                               new Ajax.Request(query, {
+                                       onComplete: function(transport) {
+                                                       feedlist_callback2(transport);
+                                               } });
+                       }
+       
+               } else {
+                       alert(__("No feeds are selected."));
                }
 
-       } else {
-
-               alert(__("No feeds are selected."));
-
+       } catch (e) {
+               exception_error("removeSelectedFeeds", e);
        }
        
        return false;
@@ -760,10 +698,14 @@ function removeSelectedFeedCats() {
                if (ok) {
                        notify_progress("Removing selected categories...");
        
-                       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats&action=remove&ids="+
-                               param_escape(sel_rows.toString()), true);
-                       xmlhttp.onreadystatechange=infobox_callback;
-                       xmlhttp.send(null);
+                       var query = "backend.php?op=pref-feeds&subop=editCats&action=remove&ids="+
+                               param_escape(sel_rows.toString());
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) {
+                                       infobox_feed_cat_callback2(transport);
+                               } });
+
                }
 
        } else {
@@ -796,24 +738,6 @@ function feedEditCancel() {
        return false;
 }
 
-function feedCatEditCancel() {
-
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       active_feed_cat = false;
-
-//     notify("Operation cancelled.");
-
-       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats", true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
-
-       return false;
-}
-
 function feedEditSave() {
 
        try {
@@ -843,26 +767,6 @@ function feedEditSave() {
        } 
 }
 
-function feedCatEditSave() {
-
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       notify_progress("Saving category...");
-
-       var query = Form.serialize("feed_cat_edit_form");
-
-       xmlhttp.open("GET", "backend.php?" + query, true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
-
-       active_feed_cat = false;
-
-       return false;
-}
-
 function userEditCancel() {
 
        if (!xmlhttp_ready(xmlhttp)) {
@@ -1000,62 +904,35 @@ function resetSelectedUserPass() {
 
 function selectedUserDetails() {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       var rows = getSelectedUsers();
+       try {
 
-       if (rows.length == 0) {
-               alert(__("No users are selected."));
-               return;
-       }
+               var rows = getSelectedUsers();
+       
+               if (rows.length == 0) {
+                       alert(__("No users are selected."));
+                       return;
+               }
+       
+               if (rows.length > 1) {
+                       alert(__("Please select only one user."));
+                       return;
+               }
+       
+               notify_progress("Loading, please wait...");
+       
+               var id = rows[0];
+       
+               var query = "backend.php?op=pref-users&subop=user-details&id=" + id;
 
-       if (rows.length > 1) {
-               alert(__("Please select only one user."));
-               return;
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       infobox_callback2(transport);
+                               } });
+       } catch (e) {
+               exception_error("selectedUserDetails", e);
        }
-
-       notify_progress("Loading, please wait...");
-
-       var id = rows[0];
-
-       xmlhttp.open("GET", "backend.php?op=pref-users&subop=user-details&id=" + id, true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
-
 }
 
-function selectedFeedDetails() {
-
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       var rows = getSelectedFeeds();
-
-       if (rows.length == 0) {
-               alert(__("No feeds are selected."));
-               return;
-       }
-
-       if (rows.length > 1) {
-               alert(__("Please select only one feed."));
-               return;
-       }
-
-//     var id = rows[0];
-
-       notify("");
-
-       xmlhttp.open("GET", "backend.php?op=feed-details&id=" + 
-               param_escape(rows.toString()), true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
-
-}
 
 function editSelectedFilter() {
        var rows = getSelectedFilters();
@@ -1098,49 +975,31 @@ function editSelectedFeed() {
 
 function editSelectedFeeds() {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       var rows = getSelectedFeeds();
-
-       if (rows.length == 0) {
-               alert(__("No feeds are selected."));
-               return;
-       }
-
-       notify("");
-
-       disableHotkeys();
-
-       notify_progress("Loading, please wait...");
-
-       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editfeeds&ids=" +
-               param_escape(rows.toString()), true);
-
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
-
-}
-
-function editSelectedFeedCat() {
-       var rows = getSelectedFeedCats();
+       try {
+               var rows = getSelectedFeeds();
+       
+               if (rows.length == 0) {
+                       alert(__("No feeds are selected."));
+                       return;
+               }
+       
+               notify("");
+       
+               disableHotkeys();
+       
+               notify_progress("Loading, please wait...");
+       
+               var query = "backend.php?op=pref-feeds&subop=editfeeds&ids=" +
+                       param_escape(rows.toString());
 
-       if (rows.length == 0) {
-               alert(__("No categories are selected."));
-               return;
-       }
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       infobox_callback2(transport);
+                               } });
 
-       if (rows.length > 1) {
-               alert(__("Please select only one category."));
-               return;
+       } catch (e) {
+               exception_error("editSelectedFeeds", e);
        }
-
-       notify("");
-
-       editFeedCat(rows[0]);
-
 }
 
 function piggie(enable) {
@@ -1188,20 +1047,24 @@ function updateFilterList(sort_key) {
 
 function updateLabelList(sort_key) {
 
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
+       try {
 
-       var label_search = document.getElementById("label_search");
-       var search = "";
-       if (label_search) { search = label_search.value; }
+               var label_search = document.getElementById("label_search");
+               var search = "";
+               if (label_search) { search = label_search.value; }
+       
+               var query = "backend.php?op=pref-labels&sort=" + 
+                       param_escape(sort_key) +
+                       "&search=" + param_escape(search);
+       
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                               labellist_callback2(transport);
+                       } });
 
-       xmlhttp.open("GET", "backend.php?op=pref-labels&sort=" + 
-               param_escape(sort_key) +
-               "&search=" + param_escape(search), true);
-       xmlhttp.onreadystatechange=labellist_callback;
-       xmlhttp.send(null);
+       } catch (e) {
+               exception_error("updateLabelList", e);
+       }
 }
 
 function updatePrefsList() {
@@ -1260,8 +1123,6 @@ function selectTab(id, noupdate, subop) {
                                updatePrefsList();
                        } else if (id == "userConfig") {
                                updateUsersList();
-                       } else if (id == "feedBrowser") {
-                               updateBigFeedBrowser();
                        }
                }
 
@@ -1308,14 +1169,15 @@ function backend_sanity_check_callback() {
                        }
 
                        if (!xmlhttp.responseXML) {
-                               fatalError(3, "[D001, Received reply is not XML]: " + xmlhttp.responseText);
+                               fatalError(3, "Sanity Check: Received reply is not XML", 
+                                       xmlhttp.responseText);
                                return;
                        }
        
                        var reply = xmlhttp.responseXML.firstChild.firstChild;
        
                        if (!reply) {
-                               fatalError(3, "[D002, Invalid RPC reply]: " + xmlhttp.responseText);
+                               fatalError(3, "Sanity Check: Invalid RPC reply", xmlhttp.responseText);
                                return;
                        }
        
@@ -1356,6 +1218,7 @@ function init_second_stage() {
 
        try {
                active_tab = getInitParam("prefs_active_tab");
+               if (!document.getElementById(active_tab+"Tab")) active_tab = "genConfig";
                if (!active_tab || active_tab == '0') active_tab = "genConfig";
 
                document.onkeydown = pref_hotkey_handler;
@@ -1364,6 +1227,10 @@ function init_second_stage() {
                
                caller_subop = getURLParam('subop');
 
+               if (getURLParam("subopparam")) {
+                       caller_subop = caller_subop + ":" + getURLParam("subopparam");
+               }
+
                if (tab) {
                        active_tab = tab;
                }
@@ -1466,14 +1333,6 @@ function validatePrefsReset() {
 
 }
 
-function browseFeeds(limit) {
-
-       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=browse", true);
-       xmlhttp.onreadystatechange=infobox_callback;
-       xmlhttp.send(null);
-
-}
-
 function feedBrowserSubscribe() {
        try {
 
@@ -1499,67 +1358,6 @@ function updateBigFeedBrowserBtn() {
        return updateBigFeedBrowser();
 }
 
-function updateBigFeedBrowser(limit, from_button) {
-
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       var query = "backend.php?op=pref-feed-browser";
-
-       var limit_sel = document.getElementById("feedBrowserLimit");
-
-       if (limit_sel) {
-               var limit = limit_sel[limit_sel.selectedIndex].value;
-               query = query + "&limit=" + param_escape(limit);
-       }
-
-       var search = document.getElementById("feed_browser_search");
-
-       if (search) {
-               query = query + "&search=" + param_escape(search.value);
-       }
-
-       xmlhttp.open("GET", query, true);
-       xmlhttp.onreadystatechange=feed_browser_callback;
-       xmlhttp.send(null);
-}
-
-function browserToggleExpand(id) {
-       try {
-/*             if (feed_to_expand && feed_to_expand != id) {
-                       var d = document.getElementById("BRDET-" + feed_to_expand);
-                       d.style.display = "none";
-               } */
-
-               if (!xmlhttp_ready(xmlhttp)) {
-                       printLockingError();
-                       return
-               }
-
-/*             if (feed_to_expand && id != feed_to_expand) {
-                       Effect.Fade('BRDET-' + feed_to_expand, {duration : 0.5});
-               } */
-
-               var d = document.getElementById("BRDET-" + id);
-       
-               if (Element.visible(d)) {
-                       Effect.Fade(d, {duration : 0.5});
-               } else {
-                       feed_to_expand = id;
-
-                       xmlhttp.open("GET", "backend.php?op=pref-feed-browser&subop=details&id="
-                               + param_escape(id), true);
-                       xmlhttp.onreadystatechange=expand_feed_callback;
-                       xmlhttp.send(null);
-               }
-
-       } catch (e) {
-               exception_error("browserToggleExpand", e);
-       }
-}
-
 function selectPrefRows(kind, select) {
 
        if (kind) {
@@ -1720,7 +1518,7 @@ function pref_hotkey_handler(e) {
 
                        if (keycode == 191 || keychar == '/') { // /
                                var search_boxes = new Array("label_search", 
-                                       "feed_search", "filter_search", "user_search");
+                                       "feed_search", "filter_search", "user_search", "feed_browser_search");
 
                                for (var i = 0; i < search_boxes.length; i++) {
                                        var elem = document.getElementById(search_boxes[i]);
@@ -1784,22 +1582,17 @@ function pref_hotkey_handler(e) {
                                return false;
                        }
 
-                       if (keycode == 51 && document.getElementById("feedBrowserTab")) { // 3
-                               selectTab("feedBrowser");
-                               return false;
-                       }
-
-                       if (keycode == 52 && document.getElementById("filterConfigTab")) { // 4
+                       if (keycode == 51 && document.getElementById("filterConfigTab")) { // 4
                                selectTab("filterConfig");
                                return false;
                        }
 
-                       if (keycode == 53 && document.getElementById("labelConfigTab")) { // 5
+                       if (keycode == 52 && document.getElementById("labelConfigTab")) { // 5
                                selectTab("labelConfig");
                                return false;
                        }
 
-                       if (keycode == 54 && document.getElementById("userConfigTab")) { // 6
+                       if (keycode == 53 && document.getElementById("userConfigTab")) { // 6
                                selectTab("userConfig");
                                return false;
                        }
@@ -1832,22 +1625,24 @@ function pref_hotkey_handler(e) {
 }
 
 function editFeedCats() {
-       if (!xmlhttp_ready(xmlhttp)) {
-               printLockingError();
-               return
-       }
-
-       document.getElementById("subscribe_to_feed_btn").disabled = true;
-
        try {
-               document.getElementById("top25_feeds_btn").disabled = true;
+               document.getElementById("subscribe_to_feed_btn").disabled = true;
+       
+               try {
+                       document.getElementById("top25_feeds_btn").disabled = true;
+               } catch (e) {
+                       // this button is not always available, no-op if not found
+               }
+       
+               var query = "backend.php?op=pref-feeds&subop=editCats";
+
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                               infobox_feed_cat_callback2(transport);
+                       } });
        } catch (e) {
-               // this button is not always available, no-op if not found
+               exception_error("editFeedCats", e);
        }
-
-       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats", true);
-       xmlhttp.onreadystatechange=infobox_feed_cat_callback;
-       xmlhttp.send(null);
 }
 
 function showFeedsWithErrors() {
@@ -2250,3 +2045,4 @@ function batchFeedsToggleField(cb, elem, label) {
        }
 }
 
+