]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.js
refactor feed edit dialog
[tt-rss.git] / prefs.js
index 556c71dbbadd46230fc8b5965504d75a63954100..5ca4e33383fa500666e60f64b7db1a8cfc1843d9 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -6,10 +6,6 @@ var caller_subop = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 
-var color_picker_active = false;
-var selection_disabled = false;
-var mouse_is_down = false;
-
 var seq = "";
 
 function feedlist_callback2(transport) {
@@ -29,7 +25,6 @@ function feedlist_callback2(transport) {
                        caller_subop = false;
                }
                notify("");
-               remove_splash();
 
        } catch (e) {
                exception_error("feedlist_callback2", e);
@@ -39,30 +34,6 @@ function feedlist_callback2(transport) {
 function filterlist_callback2(transport) {
        dijit.byId('filterConfigTab').attr('content', transport.responseText); 
        notify("");
-       remove_splash();
-}
-
-function init_label_inline_editor() {
-       try {
-               if ($("prefLabelList")) {
-                       var elems = $("prefLabelList").getElementsByTagName("SPAN");
-
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("LILT-")) {
-
-                                       var id = elems[i].id.replace("LILT-", "");
-
-                                       new Ajax.InPlaceEditor(elems[i],
-                                               'backend.php?op=pref-labels&subop=save&id=' + id,
-                                               {cols: 20, rows: 1});
-
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("init_label_inline_editor", e);
-       }
 }
 
 function labellist_callback2(transport) {
@@ -72,10 +43,7 @@ function labellist_callback2(transport) {
                dijit.byId('labelConfigTab').attr('content', transport.responseText); 
                closeInfoBox();
 
-               init_label_inline_editor();
-       
                notify("");
-               remove_splash();
 
        } catch (e) {
                exception_error("labellist_callback2", e);
@@ -87,7 +55,6 @@ function userlist_callback2(transport) {
                dijit.byId('userConfigTab').attr('content', transport.responseText); 
 
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("userlist_callback2", e);
        }
@@ -98,7 +65,6 @@ function prefslist_callback2(transport) {
                dijit.byId('genConfigTab').attr('content', transport.responseText); 
 
                notify("");
-               remove_splash();
        } catch (e) {
                exception_error("prefslist_callback2", e);
        }
@@ -128,35 +94,6 @@ function init_profile_inline_editor() {
        }
 }
 
-function init_cat_inline_editor() {
-       try {
-
-               if ($("prefFeedCatList")) {
-                       var elems = $("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);
-                               }
-                       }
-               }
-
-       } 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);
-       }
-}
-
 function updateFeedList(sort_key) {
 
        try {
@@ -279,10 +216,10 @@ function addFeedCat() {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
+                                       infobox_callback2(transport);
                                } });
 
-               link.value = "";
+               cat.value = "";
 
        }
 }
@@ -351,71 +288,75 @@ function editUser(id, event) {
 }
 
 function editFilter(id, event) {
-
        try {
 
-               if (!event || !event.ctrlKey) {
-
-                       notify_progress("Loading, please wait...");
-
-                       selectTableRows('prefFilterList', 'none');
-                       selectTableRowById('FILRR-'+id, 'FICHK-'+id, true);
-
-                       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);
-               }
-
-       } catch (e) {
-               exception_error("editFilter", e);
-       }
-}
+               var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id);
 
-function editFeed(feed, event) {
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
 
-       try {
+               dialog = new dijit.Dialog({
+                       id: "filterEditDlg",
+                       title: __("Edit Filter"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
 
-               if (event && !event.ctrlKey) {
+                                       var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + 
+                                               param_escape(dialog.attr('value').reg_exp);
 
-                       notify_progress("Loading, please wait...");
+                                       notify_progress("Verifying regular expression...");
 
-//                     selectTableRows('prefFeedList', 'none');        
-//                     selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
-       
-                       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) {
+                                                       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 {
+                                                                       notify_progress("Saving data...", true);
+
+                                                                       console.log(dojo.objectToQuery(dialog.attr('value')));
+
+                                                                       new Ajax.Request("backend.php", {
+                                                                               parameters: dojo.objectToQuery(dialog.attr('value')),
+                                                                               onComplete: function(transport) {
+                                                                                       dialog.hide();
+                                                                                       updateFilterList();                             
+                                                                       }})
+                                                               }       
+                                                       }
+                                       }});
+                               }
+                       },
+                       href: query});
 
-               } else if (event.ctrlKey) {
-//                     var cb = $('FRCHK-' + feed);
-//                     cb.checked = !cb.checked;
-//                     toggleSelectRow(cb);
-               }
+               dialog.show();
 
 
        } catch (e) {
-               exception_error("editFeed", e);
+               exception_error("editFilter", e);
        }
 }
 
 function getSelectedLabels() {
-       return getSelectedTableRowIds("prefLabelList");
+       var tree = dijit.byId("labelTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
 }
 
 function getSelectedUsers() {
@@ -435,7 +376,16 @@ function getSelectedFeeds() {
 }
 
 function getSelectedFilters() {
-       return getSelectedTableRowIds("prefFilterList");
+       var tree = dijit.byId("filterTree");
+       var items = tree.model.getCheckedItems();
+       var rv = [];
+
+       items.each(function(item) {
+               rv.push(tree.model.store.getValue(item, 'bare_id'));
+       });
+
+       return rv;
+
 }
 
 function getSelectedFeedCats() {
@@ -682,7 +632,7 @@ function removeSelectedFeedCats() {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                       infobox_feed_cat_callback2(transport);
+                                       infobox_callback2(transport);
                                } });
 
                }
@@ -696,46 +646,11 @@ function removeSelectedFeedCats() {
        return false;
 }
 
-function feedEditCancel() {
-       closeInfoBox();
-       return false;
-}
-
-function feedEditSave() {
-
-       try {
-       
-               // FIXME: add parameter validation
-
-               var query = Form.serialize("edit_feed_form");
-
-               notify_progress("Saving feed...");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               feedlist_callback2(transport); 
-                       } });
-
-               closeInfoBox();
-
-               return false;
-
-       } catch (e) {
-               exception_error("feedEditSave", e);
-       } 
-}
-
 function userEditCancel() {
        closeInfoBox();
        return false;
 }
 
-function filterEditCancel() {
-       closeInfoBox();
-       return false;
-}
-
 function userEditSave() {
 
        try {
@@ -768,55 +683,6 @@ function userEditSave() {
 }
 
 
-function filterEditSave() {
-       try {
-               var reg_exp = document.forms["filter_edit_form"].reg_exp.value;
-
-               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) {
-                                       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) {
-               exception_error("filterEditSave", e);
-       }
-
-       return false;
-}
-
-
 function editSelectedUser() {
        var rows = getSelectedUsers();
 
@@ -957,7 +823,7 @@ function editSelectedFeeds() {
        
                notify("");
        
-               notify_progress("Loading, please wait...");
+               notify_progress("Loading, please wait...", true);
        
                var query = "?op=pref-feeds&subop=editfeeds&ids=" +
                        param_escape(rows.toString());
@@ -1109,8 +975,6 @@ function init_second_stage() {
        try {
 
                document.onkeydown = pref_hotkey_handler;
-               document.onmousedown = mouse_down_handler;
-               document.onmouseup = mouse_up_handler;
 
                caller_subop = getURLParam('subop');
 
@@ -1118,28 +982,22 @@ function init_second_stage() {
                        caller_subop = caller_subop + ":" + getURLParam("subopparam");
                }
 
-               loading_set_progress(60);
+               loading_set_progress(50);
 
                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');
+                       var 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);
+                       if (tab) {
+                               tab = dijit.byId(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);
@@ -1156,31 +1014,41 @@ function init() {
                dojo.require("dijit.layout.ContentPane");
                dojo.require("dijit.Dialog");
                dojo.require("dijit.form.Button");
+               dojo.require("dijit.form.Select");
+               dojo.require("dijit.form.FilteringSelect");
                dojo.require("dijit.form.TextBox");
+               dojo.require("dijit.form.CheckBox");
+               dojo.require("dijit.form.ValidationTextBox");
                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.form.Form");
                dojo.require("dijit.Menu");
                dojo.require("dijit.tree.dndSource");
+               dojo.require("dijit.InlineEditBox");
+               dojo.require("dijit.ColorPalette");
+               dojo.require("dijit.ProgressBar"); 
 
                dojo.registerModulePath("lib", "..");
                dojo.registerModulePath("fox", "../..");
 
                dojo.require("lib.CheckBoxTree");
                dojo.require("fox.PrefFeedTree");
+               dojo.require("fox.PrefFilterTree");
+               dojo.require("fox.PrefLabelTree");
 
-               loading_set_progress(30);
-
-               var query = "?op=rpc&subop=sanityCheck";
+               dojo.addOnLoad(function() {
+                       loading_set_progress(50);
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               backend_sanity_check_callback(transport);
-                       } });
+                       new Ajax.Request("backend.php", {
+                               parameters: {op: "rpc", subop: "sanityCheck"},
+                                       onComplete: function(transport) { 
+                                       backend_sanity_check_callback(transport);
+                               } });
+               });
 
        } catch (e) {
                exception_error("init", e);
@@ -1246,7 +1114,6 @@ function pref_hotkey_handler(e) {
                        if (Element.visible("hotkey_help_overlay")) {
                                Element.hide("hotkey_help_overlay");
                        }
-                       colorPickerHideAll();
                        hotkey_prefix = false;
                        closeInfoBox();
                } 
@@ -1417,7 +1284,7 @@ function editFeedCats() {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
-                               infobox_feed_cat_callback2(transport);
+                               infobox_callback2(transport);
                        } });
        } catch (e) {
                exception_error("editFeedCats", e);
@@ -1510,11 +1377,6 @@ function changeUserEmail() {
 
 }
 
-function feedlistToggleSLAT() {
-       notify_progress("Loading, please wait...");
-       updateFeedList()
-}
-
 function opmlRegenKey() {
 
        try {
@@ -1702,8 +1564,8 @@ function removeFilter(id, title) {
                var ok = confirm(msg);
        
                if (ok) {
-                       closeInfoBox();
-       
+                       dijit.byId("filterEditDlg").hide();
+
                        notify_progress("Removing filter...");
                
                        var query = "?op=pref-filters&subop=remove&ids="+
@@ -1826,127 +1688,41 @@ function labelColorReset() {
        }
 }
 
-function labelColorAsk(id, kind) {
+function setLabelColor(id, fg, bg) {
        try {
 
-               var p = null
-
-               if (kind == "fg") {
-                       p = prompt(__("Please enter new label foreground color:"));
-               } else {
-                       p = prompt(__("Please enter new label background color:"));
-               }
-
-               if (p != null) {
-
-                       var query = "?op=pref-labels&subop=color-set&kind=" + kind +
-                               "&ids="+        param_escape(id) + "&color=" + param_escape(p);
-
-                       selectTableRows('prefLabelList', 'none');
-
-                       var e = $("LICID-" + id);
-
-                       if (e) {                
-                               if (kind == "fg") {
-                                       e.style.color = p
-                               } else {
-                                       e.style.backgroundColor = p;
-                               }
-                       }
-
-                       new Ajax.Request("backend.php", { parameters: query });
+               var kind = '';
+               var color = '';
+
+               if (fg && bg) {
+                       kind = 'both';
+               } else if (fg) {
+                       kind = 'fg';
+                       color = fg;
+               } else if (bg) {
+                       kind = 'bg';
+                       color = bg;
                }
 
-       } catch (e) {
-               exception_error("labelColorReset", e);
-       }
-}
-
-
-function colorPicker(id, fg, bg) {
-       try {
-               var picker = $("colorPicker-" + id);
-
-               if (picker) Element.show(picker);
-
-       } catch (e) {
-               exception_error("colorPicker", e);
-       }
-}
-
-function colorPickerHideAll() {
-       try {
-               if ($("prefLabelList")) {
-
-                       var elems = $("prefLabelList").getElementsByTagName("DIV");
-
-                       for (var i = 0; i < elems.length; i++) {
-                               if (elems[i].id && elems[i].id.match("colorPicker-")) {
-                                       Element.hide(elems[i]);
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("colorPickerHideAll", e);
-       }
-}
-
-function colorPickerDo(id, fg, bg) {
-       try {
-
-               var query = "?op=pref-labels&subop=color-set&kind=both"+
+               var query = "?op=pref-labels&subop=color-set&kind="+kind+
                        "&ids=" + param_escape(id) + "&fg=" + param_escape(fg) + 
-                       "&bg=" + param_escape(bg);
+                       "&bg=" + param_escape(bg) + "&color=" + param_escape(color);
+
+//             console.log(query);
 
                var e = $("LICID-" + id);
 
                if (e) {                
-                       e.style.color = fg;
-                       e.style.backgroundColor = bg;
+                       if (fg) e.style.color = fg;
+                       if (bg) e.style.backgroundColor = bg;
                }
 
                new Ajax.Request("backend.php", { parameters: query });
 
-       } catch (e) {
-               exception_error("colorPickerDo", e);
-       }
-}
-
-function colorPickerActive(b) {
-       color_picker_active = b;
-}
-
-function mouse_down_handler(e) {
-       try {
-
-               /* do not prevent right click */
-               if (e && e.button && e.button == 2) return;
-
-               if (selection_disabled) {
-                       document.onselectstart = function() { return false; };
-                       return false;
-               }
-
-       } catch (e) {
-               exception_error("mouse_down_handler", e);
-       }
-}
-
-function mouse_up_handler(e) {
-       try {
-               mouse_is_down = false;
-
-               if (!selection_disabled) {
-                       document.onselectstart = null;
-               }
-
-               if (!color_picker_active) {
-                       colorPickerHideAll();
-               }
+               updateFilterList();
 
        } catch (e) {
-               exception_error("mouse_up_handler", e);
+               exception_error("colorPickerDo", e);
        }
 }
 
@@ -2040,3 +1816,101 @@ function handle_rpc_reply(transport, scheduled_call) {
        return true;
 }
 
+function resetFeedOrder() {
+       try {
+               notify_progress("Loading, please wait...");
+
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=feedsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
+
+
+       } catch (e) {
+               exception_error("resetFeedOrder");
+       }
+}
+
+function resetCatOrder() {
+       try {
+               notify_progress("Loading, please wait...");
+
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=pref-feeds&subop=catsortreset",
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
+
+
+       } catch (e) {
+               exception_error("resetCatOrder");
+       }
+}
+
+function editCat(id, item, event) {
+       try {
+               var new_name = prompt(__('Rename category to:'), item.name);
+
+               if (new_name && new_name != item.name) {
+
+                       notify_progress("Loading, please wait...");
+
+                       new Ajax.Request("backend.php", {
+                       parameters: {
+                               op: 'pref-feeds', 
+                               subop: 'renamecat',
+                               id: id,
+                               title: new_name,
+                       },
+                       onComplete: function(transport) {
+                               updateFeedList();       
+                       } });
+               }
+
+       } catch (e) {
+               exception_error("editCat", e);
+       }
+}
+
+function editLabel(id, event) {
+       try {
+               var query = "backend.php?op=pref-labels&subop=edit&id=" +
+                       param_escape(id);
+
+               if (dijit.byId("labelEditDlg"))
+                       dijit.byId("labelEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "labelEditDlg",
+                       title: __("Label Editor"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       var caption = this.attr('value').id;
+                                       var caption = this.attr('value').caption;
+                                       var fg_color = this.attr('value').fg_color;
+                                       var bg_color = this.attr('value').bg_color;
+                                       var query = dojo.objectToQuery(this.attr('value'));
+
+                                       dijit.byId('labelTree').setNameById(id, caption);
+                                       setLabelColor(id, fg_color, bg_color);
+                                       this.hide();
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       updateFilterList();     
+                                       } });
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("editLabel", e);
+       }
+}
+
+