]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
schema: add ttrss_feeds.order_id
[tt-rss.git] / prefs.js
index 33ed8fd767ebb2b9829b22ff0e759ef74a61133e..556c71dbbadd46230fc8b5965504d75a63954100 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1,5 +1,4 @@
 var active_feed_cat = false;
-var active_tab = false;
 
 var init_params = new Array();
 
@@ -11,15 +10,14 @@ var color_picker_active = false;
 var selection_disabled = false;
 var mouse_is_down = false;
 
-var db = false;
-var store = false;
+var seq = "";
 
 function feedlist_callback2(transport) {
 
        try {   
 
-               var container = $('prefContent');       
-               container.innerHTML=transport.responseText;
+               dijit.byId('feedConfigTab').attr('content', transport.responseText); 
+
                selectTab("feedConfig", true);
 
                if (caller_subop) {
@@ -30,9 +28,6 @@ function feedlist_callback2(transport) {
 
                        caller_subop = false;
                }
-               if (typeof correctPNG != 'undefined') {
-                       correctPNG();
-               }
                notify("");
                remove_splash();
 
@@ -42,11 +37,7 @@ function feedlist_callback2(transport) {
 }
 
 function filterlist_callback2(transport) {
-       var container = $('prefContent');
-       container.innerHTML=transport.responseText;
-       if (typeof correctPNG != 'undefined') {
-               correctPNG();
-       }
+       dijit.byId('filterConfigTab').attr('content', transport.responseText); 
        notify("");
        remove_splash();
 }
@@ -78,17 +69,13 @@ function labellist_callback2(transport) {
 
        try {
 
-               var container = $('prefContent');
-                       closeInfoBox();
-                       container.innerHTML=transport.responseText;
+               dijit.byId('labelConfigTab').attr('content', transport.responseText); 
+               closeInfoBox();
 
-                       init_label_inline_editor();
+               init_label_inline_editor();
        
-                       if (typeof correctPNG != 'undefined') {
-                               correctPNG();
-                       }
-                       notify("");
-                       remove_splash();
+               notify("");
+               remove_splash();
 
        } catch (e) {
                exception_error("labellist_callback2", e);
@@ -97,12 +84,10 @@ function labellist_callback2(transport) {
 
 function userlist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               if (transport.readyState == 4) {
-                       container.innerHTML=transport.responseText;
-                       notify("");
-                       remove_splash();
-               }
+               dijit.byId('userConfigTab').attr('content', transport.responseText); 
+
+               notify("");
+               remove_splash();
        } catch (e) {
                exception_error("userlist_callback2", e);
        }
@@ -110,8 +95,8 @@ function userlist_callback2(transport) {
 
 function prefslist_callback2(transport) {
        try {
-               var container = $('prefContent');
-               container.innerHTML=transport.responseText;
+               dijit.byId('genConfigTab').attr('content', transport.responseText); 
+
                notify("");
                remove_splash();
        } catch (e) {
@@ -167,7 +152,6 @@ function infobox_feed_cat_callback2(transport) {
        try {
                infobox_callback2(transport);
                init_cat_inline_editor();
-               $('fadd_cat').focus();
        } catch (e) {
                exception_error("infobox_feed_cat_callback2", e);
        }
@@ -334,15 +318,14 @@ function addUser() {
        }
 }
 
-function editUser(id) {
+function editUser(id, event) {
 
        try {
-
-               disableHotkeys();
+               if (!event || !event.ctrlKey) {
 
                notify_progress("Loading, please wait...");
 
-               selectTableRowsByIdPrefix('prefUserList', 'UMRR-', 'UMCHK-', false);
+               selectTableRows('prefUserList', 'none');
                selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
 
                var query = "?op=pref-users&subop=edit&id=" +
@@ -355,58 +338,76 @@ function editUser(id) {
                                        document.forms['user_edit_form'].login.focus(); 
                                } });
 
+               } else if (event.ctrlKey) {
+                       var cb = $('UMCHK-' + id);
+                       cb.checked = !cb.checked;
+                       toggleSelectRow(cb);
+               }
+
        } catch (e) {
                exception_error("editUser", e);
        }
                
 }
 
-function editFilter(id) {
+function editFilter(id, event) {
 
        try {
 
-               disableHotkeys();
+               if (!event || !event.ctrlKey) {
 
-               notify_progress("Loading, please wait...");
+                       notify_progress("Loading, please wait...");
 
-               selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
-               selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
+                       selectTableRows('prefFilterList', 'none');
+                       selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
 
-               var query = "?op=pref-filters&subop=edit&id=" + 
-                       param_escape(id);
+                       var query = "?op=pref-filters&subop=edit&id=" + 
+                               param_escape(id);
+       
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               infobox_callback2(transport);
+                                               document.forms['filter_edit_form'].reg_exp.focus();
+                                       } });
+               } else if (event.ctrlKey) {
+                       var cb = $('FICHK-' + id);
+                       cb.checked = !cb.checked;
+                       toggleSelectRow(cb);
+               }
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                                       document.forms['filter_edit_form'].reg_exp.focus();
-                               } });
        } catch (e) {
                exception_error("editFilter", e);
        }
 }
 
-function editFeed(feed) {
+function editFeed(feed, event) {
 
        try {
 
-               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);
+               if (event && !event.ctrlKey) {
+
+                       notify_progress("Loading, please wait...");
+
+//                     selectTableRows('prefFeedList', 'none');        
+//                     selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
        
-               var query = "?op=pref-feeds&subop=editfeed&id=" +
-                       param_escape(feed);
+                       var query = "?op=pref-feeds&subop=editfeed&id=" +
+                               param_escape(feed);
        
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       infobox_callback2(transport);
-                                       document.forms["edit_feed_form"].title.focus();
-                               } });
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               infobox_callback2(transport);
+                                               document.forms["edit_feed_form"].title.focus();
+                                       } });
+
+               } else if (event.ctrlKey) {
+//                     var cb = $('FRCHK-' + feed);
+//                     cb.checked = !cb.checked;
+//                     toggleSelectRow(cb);
+               }
+
 
        } catch (e) {
                exception_error("editFeed", e);
@@ -414,23 +415,31 @@ function editFeed(feed) {
 }
 
 function getSelectedLabels() {
-       return getSelectedTableRowIds("prefLabelList", "LILRR");
+       return getSelectedTableRowIds("prefLabelList");
 }
 
 function getSelectedUsers() {
-       return getSelectedTableRowIds("prefUserList", "UMRR");
+       return getSelectedTableRowIds("prefUserList");
 }
 
 function getSelectedFeeds() {
-       return getSelectedTableRowIds("prefFeedList", "FEEDR");
+       var tree = dijit.byId("feedTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
 }
 
 function getSelectedFilters() {
-       return getSelectedTableRowIds("prefFilterList", "FILRR");
+       return getSelectedTableRowIds("prefFilterList");
 }
 
 function getSelectedFeedCats() {
-       return getSelectedTableRowIds("prefFeedCatList", "FCATR");
+       return getSelectedTableRowIds("prefFeedCatList");
 }
 
 
@@ -688,11 +697,7 @@ function removeSelectedFeedCats() {
 }
 
 function feedEditCancel() {
-
        closeInfoBox();
-
-       selectPrefRows('feed', false); // cleanup feed selection
-
        return false;
 }
 
@@ -722,21 +727,12 @@ function feedEditSave() {
 }
 
 function userEditCancel() {
-
-       selectPrefRows('user', false); // cleanup feed selection
        closeInfoBox();
-
        return false;
 }
 
 function filterEditCancel() {
-
-       try {
-               selectPrefRows('filter', false); // cleanup feed selection
-       } catch (e) { }
-
        closeInfoBox();
-
        return false;
 }
 
@@ -773,19 +769,44 @@ function userEditSave() {
 
 
 function filterEditSave() {
-
        try {
+               var reg_exp = document.forms["filter_edit_form"].reg_exp.value;
 
-               notify_progress("Saving filter...");
-       
-               var query = "?" + Form.serialize("filter_edit_form");
-       
-               closeInfoBox();
+               var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + param_escape(reg_exp);
+
+               notify_progress("Verifying regular expression...");
 
                new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                               filterlist_callback2(transport);
+                                       handle_rpc_reply(transport);
+
+                                       var response = transport.responseXML;
+
+                                       if (response) {
+                                               var s = response.getElementsByTagName("status")[0].firstChild.nodeValue;
+       
+                                               notify('');
+
+                                               if (s == "INVALID") {
+                                                       alert("Match regular expression seems to be invalid.");
+                                                       return;
+                                               } else {
+
+                                                       var query = "?" + Form.serialize("filter_edit_form");
+                                       
+                                                       notify_progress("Saving filter...");
+                       
+                                                       Form.disable("filter_edit_form");
+
+                                                       new Ajax.Request("backend.php", {
+                                                                       parameters: query,
+                                                                       onComplete: function(transport) {
+                                                                                       closeInfoBox();
+                                                                                       filterlist_callback2(transport);
+                                                               } });
+                                               }
+                                       }
                        } });
 
        } catch (e) {
@@ -920,7 +941,7 @@ function editSelectedFeed() {
 
        notify("");
 
-       editFeed(rows[0]);
+       editFeed(rows[0], {});
 
 }
 
@@ -936,8 +957,6 @@ function editSelectedFeeds() {
        
                notify("");
        
-               disableHotkeys();
-       
                notify_progress("Loading, please wait...");
        
                var query = "?op=pref-feeds&subop=editfeeds&ids=" +
@@ -1038,20 +1057,8 @@ function updatePrefsList() {
 }
 
 function selectTab(id, noupdate, subop) {
-
-//     alert(id);
-
-       if (!id) id = active_tab;
-
        try {
 
-               try {
-                       if (id != active_tab) {
-                               var c = $('prefContent');       
-                               c.scrollTop = 0;
-                       }
-               } catch (e) { };
-
                if (!noupdate) {
 
                        console.log("selectTab: " + id + "(NU: " + noupdate + ")");
@@ -1078,32 +1085,20 @@ function selectTab(id, noupdate, subop) {
                        } else if (id == "userConfig") {
                                updateUsersList();
                        }
+
+                       var tab = dijit.byId(id + "Tab");
+                       dijit.byId("pref-tabs").selectChild(tab);
+
                }
 
                /* clean selection from all tabs */
        
-               var tabs_holder = $("prefTabs");
-               var tab = tabs_holder.firstChild;
-
-               while (tab) {
-                       if (tab.className && tab.className.match("prefsTabSelected")) {
-                               tab.className = "prefsTab";
-                       }
-                       tab = tab.nextSibling;
-               }
+               $$("#prefTabs div").invoke('removeClassName', 'Selected');
 
                /* mark new tab as selected */
 
-               tab = $(id + "Tab");
+               $(id + "Tab").addClassName("Selected");
        
-               if (tab) {
-                       if (!tab.className.match("Selected")) {
-                               tab.className = tab.className + "Selected";
-                       }
-               }
-       
-               active_tab = id;
-
        } catch (e) {
                exception_error("selectTab", e);
        }
@@ -1112,36 +1107,39 @@ function selectTab(id, noupdate, subop) {
 function init_second_stage() {
 
        try {
-               active_tab = getInitParam("prefs_active_tab");
-               if (!$(active_tab+"Tab")) active_tab = "genConfig";
-               if (!active_tab || active_tab == '0') active_tab = "genConfig";
 
                document.onkeydown = pref_hotkey_handler;
                document.onmousedown = mouse_down_handler;
                document.onmouseup = mouse_up_handler;
 
-               var tab = getURLParam('tab');
-               
                caller_subop = getURLParam('subop');
 
                if (getURLParam("subopparam")) {
                        caller_subop = caller_subop + ":" + getURLParam("subopparam");
                }
 
-               if (tab) {
-                       active_tab = tab;
-               }
+               loading_set_progress(60);
 
-               if (navigator.userAgent.match("Opera")) {       
-                       setTimeout("selectTab()", 500);
-               } else {
-                       selectTab(active_tab);
-               }
                notify("");
 
-               loading_set_progress(60);
+               dojo.addOnLoad(function() {
+
+                       var active_tab = getInitParam("prefs_active_tab");
+                       if (!$(active_tab+"Tab")) active_tab = "genConfig";
+                       if (!active_tab || active_tab == '0') active_tab = "genConfig";
+
+                       var http_tab = getURLParam('tab');
+
+                       if (http_tab) active_tab = http_tab;
+
+                       var tab = dijit.byId(active_tab + "Tab");
+
+                       if (tab) dijit.byId("pref-tabs").selectChild(tab);
+
+                       });
 
                setTimeout("hotkey_prefix_timeout()", 5*1000);
+               remove_splash();
 
        } catch (e) {
                exception_error("init_second_stage", e);
@@ -1152,6 +1150,28 @@ function init() {
 
        try {
        
+               dojo.require("dijit.layout.TabContainer");
+               dojo.require("dijit.layout.BorderContainer");
+               dojo.require("dijit.layout.AccordionContainer");
+               dojo.require("dijit.layout.ContentPane");
+               dojo.require("dijit.Dialog");
+               dojo.require("dijit.form.Button");
+               dojo.require("dijit.form.TextBox");
+               dojo.require("dijit.form.RadioButton");
+               dojo.require("dijit.form.Select");
+               dojo.require("dijit.Toolbar");
+               dojo.require("dojo.data.ItemFileWriteStore");
+               dojo.require("dijit.Tree");
+               dojo.require("dijit.form.DropDownButton");
+               dojo.require("dijit.Menu");
+               dojo.require("dijit.tree.dndSource");
+
+               dojo.registerModulePath("lib", "..");
+               dojo.registerModulePath("fox", "../..");
+
+               dojo.require("lib.CheckBoxTree");
+               dojo.require("fox.PrefFeedTree");
+
                loading_set_progress(30);
 
                var query = "?op=rpc&subop=sanityCheck";
@@ -1199,87 +1219,6 @@ function validatePrefsReset() {
 
 }
 
-function selectPrefRows(kind, select) {
-
-       if (kind) {
-               var opbarid = false;    
-               var nchk = false;
-               var nrow = false;
-               var lname = false;
-
-               if (kind == "feed") {
-                       opbarid = "feedOpToolbar";
-                       nrow = "FEEDR-";
-                       nchk = "FRCHK-";                        
-                       lname = "prefFeedList";
-               } else if (kind == "fcat") {
-                       opbarid = "catOpToolbar";
-                       nrow = "FCATR-";
-                       nchk = "FCCHK-";
-                       lname = "prefFeedCatList";
-               } else if (kind == "filter") {
-                       opbarid = "filterOpToolbar";
-                       nrow = "FILRR-";
-                       nchk = "FICHK-";
-                       lname = "prefFilterList";
-               } else if (kind == "label") {
-                       opbarid = "labelOpToolbar";
-                       nrow = "LILRR-";
-                       nchk = "LICHK-";
-                       lname = "prefLabelList";
-               } else if (kind == "user") {
-                       opbarid = "userOpToolbar";
-                       nrow = "UMRR-";
-                       nchk = "UMCHK-";
-                       lname = "prefUserList";
-               } else if (kind == "fbrowse") {
-                       opbarid = "browseOpToolbar";
-                       nrow = "FBROW-";
-                       nchk = "FBCHK-";
-                       lname = "browseFeedList";
-               }
-
-               if (opbarid) {
-                       selectTableRowsByIdPrefix(lname, nrow, nchk, select);
-               }
-
-       } 
-}
-
-
-function toggleSelectPrefRow(sender, kind) {
-
-       toggleSelectRow(sender);
-
-       if (kind) {
-               var opbarid = false;    
-               var nsel = -1;
-               
-               if (kind == "feed") {
-                       opbarid = "feedOpToolbar";
-                       nsel = getSelectedFeeds();
-               } else if (kind == "fcat") {
-                       opbarid = "catOpToolbar";
-                       nsel = getSelectedFeedCats();
-               } else if (kind == "filter") {
-                       opbarid = "filterOpToolbar";
-                       nsel = getSelectedFilters();
-               } else if (kind == "label") {
-                       opbarid = "labelOpToolbar";
-                       nsel = getSelectedLabels();
-               } else if (kind == "user") {
-                       opbarid = "userOpToolbar";
-                       nsel = getSelectedUsers();
-               }
-
-       } 
-}
-
-function toggleSelectFBListRow(sender) {
-       toggleSelectListRow(sender);
-}
-
-var seq = "";
 
 function pref_hotkey_handler(e) {
        try {
@@ -1312,12 +1251,19 @@ function pref_hotkey_handler(e) {
                        closeInfoBox();
                } 
 
-               if (!hotkeys_enabled) {
+               var dialog = dijit.byId("infoBox");
+               var dialog_visible = false;
+
+               if (dialog)
+                       dialog_visible = Element.visible(dialog.domNode);
+
+               if (dialog_visible || !hotkeys_enabled) {
                        console.log("hotkeys disabled");
                        return;
                }
 
                if (keycode == 16) return; // ignore lone shift
+               if (keycode == 17) return; // ignore lone ctrl
 
                if ((keycode == 67 || keycode == 71) && !hotkey_prefix) {
                        hotkey_prefix = keycode;
@@ -1548,7 +1494,7 @@ function changeUserEmail() {
 
                var query = Form.serialize("change_email_form");
        
-               notify_progress("Trying to change e-mail...");
+               notify_progress("Saving...");
        
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1778,37 +1724,6 @@ function removeFilter(id, title) {
        return false;
 }
 
-/*function unsubscribeFeed(id, title) {
-
-       try {
-
-               var msg = __("Unsubscribe from %s?").replace("%s", title);
-       
-               var ok = confirm(msg);
-       
-               if (ok) {
-                       closeInfoBox();
-       
-                       notify_progress("Removing feed...");
-               
-                       var query = "?op=pref-feeds&subop=remove&ids="+
-                               param_escape(id);
-       
-                       new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                                       feedlist_callback2(transport);
-                               } });
-               }
-       
-       } catch (e) {
-               exception_error("unsubscribeFeed", e);
-       }
-
-       return false;
-
-} */
-
 function feedsEditSave() {
        try {
 
@@ -1927,7 +1842,7 @@ function labelColorAsk(id, kind) {
                        var query = "?op=pref-labels&subop=color-set&kind=" + kind +
                                "&ids="+        param_escape(id) + "&color=" + param_escape(p);
 
-                       selectPrefRows('label', false);
+                       selectTableRows('prefLabelList', 'none');
 
                        var e = $("LICID-" + id);
 
@@ -2108,4 +2023,20 @@ function clearFeedAccessKeys() {
        return false;
 }
 
+function handle_rpc_reply(transport, scheduled_call) {
+       try {
+               if (transport.responseXML) {
+
+                       if (!transport_error_check(transport)) return false;
+
+               } else {
+                       notify_error("Error communicating with server.");
+               }
+
+       } catch (e) {
+               exception_error("handle_rpc_reply", e, transport);
+       }
+
+       return true;
+}