enable toggling of debug window with shift-d

[tt-rss.git] / prefs.js

diff --git a/prefs.js b/prefs.js
index 2ac772fc184b23db5b5e7bce0b3034ebe0da594c..85ae91afc92da8ffba0d1123d2c787a8b6a2bec8 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -31,20 +31,6 @@ function feedlist_callback() {
                        var container = document.getElementById('prefContent'); 
                        container.innerHTML=xmlhttp.responseText;
                        selectTab("feedConfig", true);
-
-                       if (active_feed_cat) {
-                               var row = document.getElementById("FCATR-" + active_feed_cat);
-                               if (row) {
-                                       if (!row.className.match("Selected")) {
-                                               row.className = row.className + "Selected";
-                                       }               
-                               }
-                               var checkbox = document.getElementById("FCCHK-" + active_feed_cat);
-                               if (checkbox) {
-                                       checkbox.checked = true;
-                               }
-                       }
-
                        notify("");
                } catch (e) {
                        exception_error("feedlist_callback", e);
@@ -157,7 +143,7 @@ function updateFeedList(sort_key) {
 
 }
 
-function updateUsersList() {
+function updateUsersList(sort_key) {
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -168,7 +154,8 @@ function updateUsersList() {
 
 //     p_notify("Loading, please wait...");
 
-       xmlhttp.open("GET", "backend.php?op=pref-users", true);
+       xmlhttp.open("GET", "backend.php?op=pref-users&sort="
+               + param_escape(sort_key), true);
        xmlhttp.onreadystatechange=userlist_callback;
        xmlhttp.send(null);
 
@@ -244,9 +231,9 @@ function addFeedCat() {
        } else {
                notify("Adding feed category...");
 
-               xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=addCat&cat=" +
+               xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats&action=add&cat=" +
                        param_escape(cat.value), true);
-               xmlhttp.onreadystatechange=feedlist_callback;
+               xmlhttp.onreadystatechange=infobox_callback;
                xmlhttp.send(null);
 
                link.value = "";
@@ -364,9 +351,9 @@ function editFeedCat(cat) {
 
        active_feed_cat = cat;
 
-       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCat&id=" +
+       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats&action=edit&id=" +
                param_escape(cat), true);
-       xmlhttp.onreadystatechange=feedlist_callback;
+       xmlhttp.onreadystatechange=infobox_callback;
        xmlhttp.send(null);
 
 }
@@ -548,9 +535,9 @@ function removeSelectedFeedCats() {
                if (ok) {
                        notify("Removing selected categories...");
        
-                       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=removeCats&ids="+
+                       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats&action=remove&ids="+
                                param_escape(sel_rows.toString()), true);
-                       xmlhttp.onreadystatechange=feedlist_callback;
+                       xmlhttp.onreadystatechange=infobox_callback;
                        xmlhttp.send(null);
                }
 
@@ -588,8 +575,8 @@ function feedCatEditCancel() {
 
 //     notify("Operation cancelled.");
 
-       xmlhttp.open("GET", "backend.php?op=pref-feeds", true);
-       xmlhttp.onreadystatechange=feedlist_callback;
+       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats", true);
+       xmlhttp.onreadystatechange=infobox_callback;
        xmlhttp.send(null);
 
        return false;
@@ -636,7 +623,7 @@ function feedCatEditSave() {
        var query = Form.serialize("feed_cat_edit_form");
 
        xmlhttp.open("GET", "backend.php?" + query, true);
-       xmlhttp.onreadystatechange=feedlist_callback;
+       xmlhttp.onreadystatechange=infobox_callback;
        xmlhttp.send(null);
 
        active_feed_cat = false;
@@ -729,18 +716,21 @@ function labelEditSave() {
                return
        }
 
-       var sql_exp = document.forms["label_edit_form"].sql_exp.value;
-       var description = document.forms["label_edit_form"].description.value;
-
-       if (sql_exp.length == 0) {
-               alert("SQL Expression cannot be blank.");
-               return;
-       }
+/*     if (!is_opera()) {
 
-       if (description.length == 0) {
-               alert("Caption field cannot be blank.");
-               return;
-       }
+               var sql_exp = document.forms["label_edit_form"].sql_exp.value;
+               var description = document.forms["label_edit_form"].description.value;
+       
+               if (sql_exp.length == 0) {
+                       alert("SQL Expression cannot be blank.");
+                       return false;
+               }
+       
+               if (description.length == 0) {
+                       alert("Caption field cannot be blank.");
+                       return false;
+               }
+       } */
 
        closeInfoBox();
 
@@ -792,12 +782,14 @@ function filterEditSave() {
                return
        }
 
-       var reg_exp = document.forms["filter_edit_form"].reg_exp.value;
-
-       if (reg_exp.length == 0) {
-               alert("Filter expression field cannot be blank.");
-               return;
-       }
+/*     if (!is_opera()) {
+               var reg_exp = document.forms["filter_edit_form"].reg_exp.value;
+       
+               if (reg_exp.length == 0) {
+                       alert("Filter expression field cannot be blank.");
+                       return;
+               }
+       } */
 
        notify("Saving filter...");
 
@@ -1067,7 +1059,7 @@ function validateOpmlImport() {
        }
 }
 
-function updateFilterList() {
+function updateFilterList(sort_key) {
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -1078,13 +1070,14 @@ function updateFilterList() {
 
 //     p_notify("Loading, please wait...");
 
-       xmlhttp.open("GET", "backend.php?op=pref-filters", true);
+       xmlhttp.open("GET", "backend.php?op=pref-filters&sort=" + 
+               param_escape(sort_key), true);
        xmlhttp.onreadystatechange=filterlist_callback;
        xmlhttp.send(null);
 
 }
 
-function updateLabelList() {
+function updateLabelList(sort_key) {
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -1095,7 +1088,8 @@ function updateLabelList() {
 
 //     document.getElementById("prefContent").innerHTML = "Loading labels, please wait...";
 
-       xmlhttp.open("GET", "backend.php?op=pref-labels", true);
+       xmlhttp.open("GET", "backend.php?op=pref-labels&sort=" + 
+               param_escape(sort_key), true);
        xmlhttp.onreadystatechange=labellist_callback;
        xmlhttp.send(null);
 }
@@ -1128,11 +1122,16 @@ function selectTab(id, noupdate) {
                        return
                }
 
+               try {
+                       var c = document.getElementById('prefContent'); 
+                       c.scrollTop = 0;
+               } catch (e) { };
+
                if (!noupdate) {
 
                        debug("selectTab: " + id + "(NU: " + noupdate + ")");
        
-                       notify("Loading, please wait...", true);
+//                     notify("Loading, please wait...", true);
        
                        // close active infobox if needed
                        closeInfoBox();
@@ -1427,7 +1426,7 @@ function selectPrefRows(kind, select) {
                } else if (kind == "fcat") {
                        opbarid = "catOpToolbar";
                        nrow = "FCATR-";
-                       nchk = "FCHK-";
+                       nchk = "FCCHK-";
                        lname = "prefFeedCatList";
                } else if (kind == "filter") {
                        opbarid = "filterOpToolbar";
@@ -1529,4 +1528,19 @@ function pref_hotkey_handler(e) {
        }
 }
 
+function userSwitch() {
+       var chooser = document.getElementById("userSwitch");
+       var user = chooser[chooser.selectedIndex].value;
+       window.location = "prefs.php?swu=" + user;
+}
 
+function editFeedCats() {
+       if (!xmlhttp_ready(xmlhttp)) {
+               printLockingError();
+               return
+       }
+
+       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats", true);
+       xmlhttp.onreadystatechange=infobox_callback;
+       xmlhttp.send(null);
+}