schema: add ttrss_feeds.order_id

[tt-rss.git] / prefs.js

diff --git a/prefs.js b/prefs.js
index de19eaeb9d3d362206896180188b142a06ba451c..556c71dbbadd46230fc8b5965504d75a63954100 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -323,8 +323,6 @@ function editUser(id, event) {
        try {
                if (!event || !event.ctrlKey) {
 
-               disableHotkeys();
-
                notify_progress("Loading, please wait...");
 
                selectTableRows('prefUserList', 'none');
@@ -358,8 +356,6 @@ function editFilter(id, event) {
 
                if (!event || !event.ctrlKey) {
 
-                       disableHotkeys();
-
                        notify_progress("Loading, please wait...");
 
                        selectTableRows('prefFilterList', 'none');
@@ -391,12 +387,10 @@ function editFeed(feed, event) {
 
                if (event && !event.ctrlKey) {
 
-                       disableHotkeys();
-       
                        notify_progress("Loading, please wait...");
 
-                       selectTableRows('prefFeedList', 'none');        
-                       selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
+//                     selectTableRows('prefFeedList', 'none');        
+//                     selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
        
                        var query = "?op=pref-feeds&subop=editfeed&id=" +
                                param_escape(feed);
@@ -409,9 +403,9 @@ function editFeed(feed, event) {
                                        } });
 
                } else if (event.ctrlKey) {
-                       var cb = $('FRCHK-' + feed);
-                       cb.checked = !cb.checked;
-                       toggleSelectRow(cb);
+//                     var cb = $('FRCHK-' + feed);
+//                     cb.checked = !cb.checked;
+//                     toggleSelectRow(cb);
                }
 
 
@@ -429,7 +423,15 @@ function getSelectedUsers() {
 }
 
 function getSelectedFeeds() {
-       return getSelectedTableRowIds("prefFeedList");
+       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() {
@@ -955,8 +957,6 @@ function editSelectedFeeds() {
        
                notify("");
        
-               disableHotkeys();
-       
                notify_progress("Loading, please wait...");
        
                var query = "?op=pref-feeds&subop=editfeeds&ids=" +
@@ -1107,29 +1107,37 @@ function selectTab(id, noupdate, subop) {
 function init_second_stage() {
 
        try {
-               var 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);
 
-               selectTab(active_tab, true);
                notify("");
 
+               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();
 
@@ -1148,7 +1156,21 @@ function init() {
                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);
 
@@ -1241,6 +1263,7 @@ function pref_hotkey_handler(e) {
                }
 
                if (keycode == 16) return; // ignore lone shift
+               if (keycode == 17) return; // ignore lone ctrl
 
                if ((keycode == 67 || keycode == 71) && !hotkey_prefix) {
                        hotkey_prefix = keycode;