]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
schema: add ttrss_feeds.order_id
[tt-rss.git] / prefs.js
diff --git a/prefs.js b/prefs.js
index c5b49f5cab47863f185f11496b0e25e4846efd40..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();
 
@@ -17,8 +16,8 @@ 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) {
@@ -38,8 +37,7 @@ function feedlist_callback2(transport) {
 }
 
 function filterlist_callback2(transport) {
-       var container = $('prefContent');
-       container.innerHTML=transport.responseText;
+       dijit.byId('filterConfigTab').attr('content', transport.responseText); 
        notify("");
        remove_splash();
 }
@@ -71,14 +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();
        
-                       notify("");
-                       remove_splash();
+               notify("");
+               remove_splash();
 
        } catch (e) {
                exception_error("labellist_callback2", e);
@@ -87,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);
        }
@@ -100,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) {
@@ -157,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);
        }
@@ -327,11 +321,8 @@ function addUser() {
 function editUser(id, event) {
 
        try {
-
                if (!event || !event.ctrlKey) {
 
-               disableHotkeys();
-
                notify_progress("Loading, please wait...");
 
                selectTableRows('prefUserList', 'none');
@@ -365,8 +356,6 @@ function editFilter(id, event) {
 
                if (!event || !event.ctrlKey) {
 
-                       disableHotkeys();
-
                        notify_progress("Loading, please wait...");
 
                        selectTableRows('prefFilterList', 'none');
@@ -398,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);
@@ -416,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);
                }
 
 
@@ -436,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() {
@@ -946,7 +941,7 @@ function editSelectedFeed() {
 
        notify("");
 
-       editFeed(rows[0]);
+       editFeed(rows[0], {});
 
 }
 
@@ -962,8 +957,6 @@ function editSelectedFeeds() {
        
                notify("");
        
-               disableHotkeys();
-       
                notify_progress("Loading, please wait...");
        
                var query = "?op=pref-feeds&subop=editfeeds&ids=" +
@@ -1064,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 + ")");
@@ -1104,6 +1085,10 @@ 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 */
@@ -1114,8 +1099,6 @@ function selectTab(id, noupdate, subop) {
 
                $(id + "Tab").addClassName("Selected");
        
-               active_tab = id;
-
        } catch (e) {
                exception_error("selectTab", e);
        }
@@ -1124,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);
@@ -1164,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";
@@ -1243,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;
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/