]> git.wh0rd.org - tt-rss.git/blobdiff - functions.js
fix fatalError() not working properly
[tt-rss.git] / functions.js
index 1c21adf0a96fd70ef257124fe3763da4a7ef5fae..88365d70a555df4bbde50c7e37eba40f487d22de 100644 (file)
@@ -1,6 +1,5 @@
-var hotkeys_enabled = true;
 var notify_silent = false;
-var last_progress_point = 0;
+var loading_progress = 0;
 var sanity_check_done = false;
 
 /* add method to remove element from array */
@@ -23,8 +22,6 @@ function exception_error(location, e, ext_info) {
 
        if (!ext_info) ext_info = false;
 
-       disableHotkeys();
-
        try {
 
                if (ext_info) {
@@ -44,14 +41,16 @@ function exception_error(location, e, ext_info) {
                content += "<div><b>Stack trace:</b></div>" +
                        "<textarea readonly=\"1\">" + e.stack + "</textarea>";
 
-               content += "<div style='text-align : center'>" +
-                       "<button onclick=\"closeInfoBox()\">" +
-                       "Close this window" + "</button></div>";
-       
+               content += "</div>";
+
                // TODO: add code to automatically report errors to tt-rss.org
 
-               Modalbox.show(content, {title: "Unhandled exception", width: 600, 
-                       resizeDuration: 0, transitions: false});
+               var dialog = new dijit.Dialog({
+                       title: "Unhandled exception",
+                       style: "width: 600px",
+                       content: content});
+
+               dialog.show();
 
        } catch (e) {
                alert(msg);
@@ -80,15 +79,6 @@ function format_exception_error(location, e) {
        return msg;
 }
 
-
-function disableHotkeys() {
-       hotkeys_enabled = false;
-}
-
-function enableHotkeys() {
-       hotkeys_enabled = true;
-}
-
 function param_escape(arg) {
        if (typeof encodeURIComponent != 'undefined')
                return encodeURIComponent(arg); 
@@ -302,10 +292,28 @@ function toggleSelectListRow(sender) {
        return toggleSelectRow(sender, row);
 }
 
+/* this is for dijit Checkbox */
+function toggleSelectListRow2(sender) {
+       var row = sender.domNode.parentNode;
+       return toggleSelectRow(sender, row);
+}
+
 function tSR(sender, row) {
        return toggleSelectRow(sender, row);
 }
 
+/* this is for dijit Checkbox */
+function toggleSelectRow2(sender, row) {
+
+       if (!row) row = sender.domNode.parentNode.parentNode;
+
+       if (sender.checked && !row.hasClassName('Selected'))
+               row.addClassName('Selected');
+       else
+               row.removeClassName('Selected');
+}
+
+
 function toggleSelectRow(sender, row) {
 
        if (!row) row = sender.parentNode.parentNode;
@@ -318,10 +326,7 @@ function toggleSelectRow(sender, row) {
 
 function checkboxToggleElement(elem, id) {
        if (elem.checked) {
-               Effect.Appear(id, {duration : 0.5, 
-                       afterSetup: function() { 
-                               Modalbox.resizeToContent();
-                       }});
+               Effect.Appear(id, {duration : 0.5});
        } else {
                Effect.Fade(id, {duration : 0.5});
        }
@@ -379,18 +384,16 @@ function closeErrorBox() {
        if (Element.visible("errorBoxShadow")) {
                Element.hide("dialog_overlay");
                Element.hide("errorBoxShadow");
-
-               enableHotkeys();
        }
 
        return false;
 }
 
 function closeInfoBox(cleanup) {
-
        try {
-               enableHotkeys();
-               Modalbox.hide();
+               dialog = dijit.byId("infoBox");
+
+               if (dialog)     dialog.hide();
 
        } catch (e) {
                //exception_error("closeInfoBox", e);
@@ -401,7 +404,6 @@ function closeInfoBox(cleanup) {
 
 function displayDlg(id, param, callback) {
 
-       disableHotkeys();
        notify_progress("Loading, please wait...", true);
 
        var query = "?op=dlg&id=" +
@@ -417,23 +419,13 @@ function displayDlg(id, param, callback) {
        return false;
 }
 
-function infobox_submit_callback2(transport) {
-       closeInfoBox();
-
-       try {
-               // called from prefs, reload tab
-               if (typeof active_tab != 'undefined' && active_tab) {
-                       selectTab(active_tab, false);
-               }
-       } catch (e) { }
-
-       if (transport.responseText) {
-               notify_info(transport.responseText);
-       }
-}
-
 function infobox_callback2(transport) {
        try {
+               var dialog = false;
+
+               if (dijit.byId("infoBox")) {
+                       dialog = dijit.byId("infoBox");
+               }
 
                //console.log("infobox_callback2");
                notify('');
@@ -441,25 +433,37 @@ function infobox_callback2(transport) {
                var content;
                var dtitle = "Dialog";
 
-               if (transport.responseXML) {
-                       var dlg = transport.responseXML.getElementsByTagName("dlg")[0];
-
-                       var title = transport.responseXML.getElementsByTagName("title")[0];
-                       if (title)
-                               dtitle = title.firstChild.nodeValue;
+               var dlg = transport.responseXML.getElementsByTagName("dlg")[0];
 
-                       var content = transport.responseXML.getElementsByTagName("content")[0];
-                       
-                       content = content.firstChild.nodeValue;
+               var title = transport.responseXML.getElementsByTagName("title")[0];
+               if (title)
+                       title = title.firstChild.nodeValue;
 
+               var content = transport.responseXML.getElementsByTagName("content")[0];
+               
+               content = content.firstChild.nodeValue;
+
+               if (!dialog) {
+                       dialog = new dijit.Dialog({
+                               title: title,
+                               id: 'infoBox',
+                               style: "width: 600px",
+                               onCancel: function() {
+                                       return true;
+                               },
+                               onExecute: function() {
+                                       return true;
+                               },
+                               onClose: function() {
+                                       return true;
+                                       },
+                               content: content});
                } else {
-                       content = transport.responseText;
+                       dialog.attr('title', title);
+                       dialog.attr('content', content);
                }
 
-               Modalbox.show(content, {title: dtitle, width: 600, 
-                       transitions: true, resizeDuration: 0 });
-
-               disableHotkeys();
+               dialog.show();
 
                notify("");
        } catch (e) {
@@ -467,170 +471,6 @@ function infobox_callback2(transport) {
        }
 }
 
-function createFilter() {
-
-       try {
-
-               var form = document.forms['filter_add_form'];
-               var reg_exp = form.reg_exp.value;
-       
-               if (reg_exp == "") {
-                       alert(__("Can't add filter: nothing to match on."));
-                       return false;
-               }
-
-               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_add_form");
-                                               
-                                                       // we can be called from some other tab in Prefs                
-                                                       if (typeof active_tab != 'undefined' && active_tab) {
-                                                               active_tab = "filterConfig";
-                                                       }
-                                               
-                                                       new Ajax.Request("backend.php?" + query, {
-                                                               onComplete: function (transport) {
-                                                                       infobox_submit_callback2(transport);
-                                                               } });
-                                                       
-                                                       return true;
-                                               }
-                                       }
-
-                       } });
-
-       } catch (e) {
-               exception_error("createFilter", e);
-       }
-}
-
-function isValidURL(s) {
-       return s.match("http://") != null || s.match("https://") != null || s.match("feed://") != null;
-}
-
-function subscribeToFeed() {
-
-       try {
-
-       var form = document.forms['feed_add_form'];
-       var feed_url = form.feed_url.value;
-
-       if (feed_url == "") {
-               alert(__("Can't subscribe: no feed URL given."));
-               return false;
-       }
-
-       notify_progress(__("Subscribing to feed..."), true);
-
-       var query = Form.serialize("feed_add_form");
-       
-       console.log("subscribe q: " + query);
-
-       Form.disable("feed_add_form");
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) { 
-                       //dlg_frefresh_callback(transport); 
-
-                       try {
-
-                               if (!transport.responseXML) {
-                                       console.log(transport.responseText);
-                                       alert(__("Server error while trying to subscribe to specified feed."));
-                                       return;
-                               }
-
-                               var result = transport.responseXML.getElementsByTagName('result')[0];
-                               var rc = parseInt(result.getAttribute('code'));
-       
-                               Form.enable("feed_add_form");
-       
-                               notify('');
-       
-                               switch (rc) {
-                               case 1:
-                                       closeInfoBox();
-                                       notify_info(__("Subscribed to %s").replace("%s", feed_url));
-       
-                                       if (inPreferences()) {
-                                               updateFeedList();
-                                       } else {
-                                               setTimeout('updateFeedList(false, false)', 50);
-                                       }
-                                       break;
-                               case 2:
-                                       alert(__("Specified URL seems to be invalid."));
-                                       break;
-                               case 3:
-                                       alert(__("Specified URL doesn't seem to contain any feeds."));
-                                       break;
-                               case 4:
-                                       new Ajax.Request("backend.php", {
-                                               parameters: 'op=rpc&subop=extractfeedurls&url=' + encodeURIComponent(feed_url),
-                                               onComplete: function(transport) {
-                                                       var result = transport.responseXML.getElementsByTagName('urls')[0];
-                                                       var feeds = JSON.parse(result.firstChild.nodeValue);
-                                                       var select = document.getElementById("faad_feeds_container_select");
-       
-                                                       while (select.hasChildNodes()) {
-                                                               select.removeChild(elem.firstChild);
-                                                       }
-                                                       var count = 0;
-                                                       for (var feedUrl in feeds) {
-                                                               select.insert(new Option(feeds[feedUrl], feedUrl, false));
-                                                               count++;
-                                                       }
-                                                       if (count > 5) count = 5;
-                                                       select.size = count;
-       
-                                                       Effect.Appear('fadd_feeds_container', {duration : 0.5, 
-                                                               afterSetup: function() { 
-                                                                       Modalbox.resizeToContent()
-                                                               }});
-                                               }
-                                       });
-                                       break;
-                               case 5:
-                                       alert(__("Couldn't download the specified URL."));
-                                       break;
-                               case 0:
-                                       alert(__("You are already subscribed to this feed."));
-                                       break;
-                               }
-
-                       } catch (e) {
-                               exception_error("subscribeToFeed", e);
-                       }
-
-               } });
-
-       } catch (e) {
-               exception_error("subscribeToFeed", e);
-       }
-
-       return false;
-}
-
 function filterCR(e, f)
 {
      var key;
@@ -663,8 +503,6 @@ function setInitParam(key, value) {
 function fatalError(code, msg, ext_info) {
        try {   
 
-               if (!ext_info) ext_info = "N/A";
-
                if (code == 6) {
                        window.location.href = "tt-rss.php";                    
                } else if (code == 5) {
@@ -673,28 +511,36 @@ function fatalError(code, msg, ext_info) {
        
                        if (msg == "") msg = "Unknown error";
 
-                       var ebc = $("xebContent");
-       
-                       if (ebc) {
-       
-                               Element.show("dialog_overlay");
-                               Element.show("errorBoxShadow");
-                               Element.hide("xebBtn");
-
-                               if (ext_info) {
-                                       if (ext_info.responseText) {
-                                               ext_info = ext_info.responseText;
-                                       }
+                       if (ext_info) {
+                               if (ext_info.responseText) {
+                                       ext_info = ext_info.responseText;
                                }
+                       }
+
+                       if (ERRORS && ERRORS[code] && !msg) {
+                               msg = ERRORS[code];
+                       }
        
-                               ebc.innerHTML = 
-                                       "<div><b>Error message:</b></div>" +
-                                       "<pre>" + msg + "</pre>" +
-                                       "<div><b>Additional information:</b></div>" +
-                                       "<textarea readonly=\"1\">" + ext_info + "</textarea>";
+                       var content = "<div><b>Error code:</b> " + code + "</div>" +
+                               "<p>" + msg + "</p>";
+
+                       if (ext_info) {
+                               content = content + "<div><b>Additional information:</b></div>" +
+                                       "<textarea style='width: 100%' readonly=\"1\">" + 
+                                       ext_info + "</textarea>";
                        }
+
+                       var dialog = new dijit.Dialog({
+                               title: "Fatal error",
+                               style: "width: 600px",
+                               content: content});
+
+                       dialog.show();
+
                }
 
+               return false;
+
        } catch (e) {
                exception_error("fatalError", e);
        }
@@ -704,26 +550,15 @@ function filterDlgCheckType(sender) {
 
        try {
 
-               var ftype = sender[sender.selectedIndex].value;
-
-               var form = document.forms["filter_add_form"];
-       
-               if (!form) {
-                       form = document.forms["filter_edit_form"];
-               }
-
-               if (!form) {
-                       console.log("filterDlgCheckType: can't find form!");
-                       return;
-               }
+               var ftype = sender.value;
 
                // if selected filter type is 5 (Date) enable the modifier dropbox
                if (ftype == 5) {
-                       Element.show("filter_dlg_date_mod_box");
-                       Element.show("filter_dlg_date_chk_box");
+                       Element.show("filterDlg_dateModBox");
+                       Element.show("filterDlg_dateChkBox");
                } else {
-                       Element.hide("filter_dlg_date_mod_box");
-                       Element.hide("filter_dlg_date_chk_box");
+                       Element.hide("filterDlg_dateModBox");
+                       Element.hide("filterDlg_dateChkBox");
 
                }
 
@@ -737,20 +572,9 @@ function filterDlgCheckAction(sender) {
 
        try {
 
-               var action = sender[sender.selectedIndex].value;
+               var action = sender.value;
 
-               var form = document.forms["filter_add_form"];
-       
-               if (!form) {
-                       form = document.forms["filter_edit_form"];
-               }
-
-               if (!form) {
-                       console.log("filterDlgCheckAction: can't find form!");
-                       return;
-               }
-
-               var action_param = $("filter_dlg_param_box");
+               var action_param = $("filterDlg_paramBox");
 
                if (!action_param) {
                        console.log("filterDlgCheckAction: can't find action param box!");
@@ -759,13 +583,13 @@ function filterDlgCheckAction(sender) {
 
                // if selected action supports parameters, enable params field
                if (action == 4 || action == 6 || action == 7) {
-                       Element.show(action_param);
+                       new Effect.Appear(action_param, {duration : 0.5});
                        if (action != 7) {
-                               Element.show(form.action_param);
-                               Element.hide(form.action_param_label);
+                               Element.show(dijit.byId("filterDlg_actionParam").domNode);
+                               Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
                        } else {
-                               Element.show(form.action_param_label);
-                               Element.hide(form.action_param);
+                               Element.show(dijit.byId("filterDlg_actionParamLabel").domNode);
+                               Element.hide(dijit.byId("filterDlg_actionParam").domNode);
                        }
                } else {
                        Element.hide(action_param);
@@ -779,18 +603,9 @@ function filterDlgCheckAction(sender) {
 
 function filterDlgCheckDate() {
        try {
-               var form = document.forms["filter_add_form"];
-       
-               if (!form) {
-                       form = document.forms["filter_edit_form"];
-               }
+               var dialog = dijit.byId("filterEditDlg");
 
-               if (!form) {
-                       console.log("filterDlgCheckAction: can't find form!");
-                       return;
-               }
-
-               var reg_exp = form.reg_exp.value;
+               var reg_exp = dialog.attr('value').reg_exp;
 
                var query = "?op=rpc&subop=checkDate&date=" + reg_exp;
 
@@ -798,27 +613,15 @@ function filterDlgCheckDate() {
                        parameters: query,
                        onComplete: function(transport) { 
 
-                               var form = document.forms["filter_add_form"];
-       
-                               if (!form) {
-                                       form = document.forms["filter_edit_form"];
-                               }
-
-                               if (transport.responseXML) {
-                                       var result = transport.responseXML.getElementsByTagName("result")[0];
-
-                                       if (result && result.firstChild) {
-                                               if (result.firstChild.nodeValue == "1") {
-
-                                                       new Effect.Highlight(form.reg_exp, {startcolor : '#00ff00'});
+                               var reply = JSON.parse(transport.responseText);
 
-                                                       return;
-                                               }
-                                       }
+                               if (reply['result'] == true) {
+                                       alert(__("Date syntax appears to be correct."));
+                                       return;
+                               } else {
+                                       alert(__("Date syntax is incorrect."));
                                }
 
-                               new Effect.Highlight(form.reg_exp, {startcolor : '#ff0000'});
-
                        } });
 
 
@@ -842,21 +645,13 @@ function displayHelpInfobox(topic_id) {
 
 function loading_set_progress(p) {
        try {
-               if (p < last_progress_point || !Element.visible("overlay")) return;
-
-               console.log("loading_set_progress : " + p + " (" + last_progress_point + ")");
-
-               var o = $("l_progress_i");
-
-//             o.style.width = (p * 2) + "px";
+               loading_progress += p;
 
-               new Effect.Scale(o, p, { 
-                       scaleY : false,
-                       scaleFrom : last_progress_point,
-                       scaleMode: { originalWidth : 200 },
-                       queue: { position: 'end', scope: 'LSP-Q', limit: 3 } }); 
+               if (dijit.byId("loading_bar"))
+                       dijit.byId("loading_bar").update({progress: loading_progress});
 
-               last_progress_point = p;
+               if (loading_progress >= 90)
+                       remove_splash();
 
        } catch (e) {
                exception_error("loading_set_progress", e);
@@ -864,6 +659,7 @@ function loading_set_progress(p) {
 }
 
 function remove_splash() {
+
        if (Element.visible("overlay")) {
                console.log("about to remove splash, OMG!");
                Element.hide("overlay");
@@ -871,61 +667,6 @@ function remove_splash() {
        }
 }
 
-function getSelectedFeedsFromBrowser() {
-
-       var list = $$("#browseFeedList li[id*=FBROW]");
-
-       var selected = new Array();
-
-       list.each(function(child) {     
-               var id = child.id.replace("FBROW-", "");
-               var cb = $("FBCHK-" + id);
-
-               if (cb.checked) {
-                       selected.push(id);
-               }       
-       });
-
-       return selected;
-}
-
-function updateFeedBrowser() {
-       try {
-
-               var query = Form.serialize("feed_browser");
-
-               Element.show('feed_browser_spinner');
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               notify('');
-
-                               Element.hide('feed_browser_spinner');
-
-                               var c = $("browseFeedList");
-                               var r = transport.responseXML.getElementsByTagName("content")[0];
-                               var nr = transport.responseXML.getElementsByTagName("num-results")[0];
-                               var mode = transport.responseXML.getElementsByTagName("mode")[0];
-
-                               if (c && r) {
-                                       c.innerHTML = r.firstChild.nodeValue;
-                               }
-
-                               if (parseInt(mode.getAttribute("value")) == 2) {
-                                       Element.show('feed_archive_remove');
-                               } else {
-                                       Element.hide('feed_archive_remove');
-                               }
-       
-                       } });
-
-       } catch (e) {
-               exception_error("updateFeedBrowser", e);
-       }
-
-}
-
 function transport_error_check(transport) {
        try {
                if (transport.responseXML) {
@@ -985,78 +726,6 @@ function hideAuxDlg() {
        }
 }
 
-function feedBrowserSubscribe() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
-
-               var mode = document.forms['feed_browser'].mode;
-
-               mode = mode[mode.selectedIndex].value;
-
-               if (selected.length > 0) {
-                       closeInfoBox();
-
-                       notify_progress("Loading, please wait...", true);
-
-                       var query = "?op=rpc&subop=massSubscribe&ids="+
-                               param_escape(selected.toString()) + "&mode=" + param_escape(mode);
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-
-                                       var nf = transport.responseXML.getElementsByTagName('num-feeds')[0];
-                                       var nf_value = nf.getAttribute("value");
-
-                                       notify_info(__("Subscribed to %d feed(s).").replace("%d", nf_value));
-
-                                       if (inPreferences()) {
-                                               updateFeedList();
-                                       } else {
-                                               setTimeout('updateFeedList(false, false)', 50);
-                                       }
-                               } });
-
-               } else {
-                       alert(__("No feeds are selected."));
-               }
-
-       } catch (e) {
-               exception_error("feedBrowserSubscribe", e);
-       }
-}
-
-function feedArchiveRemove() {
-       try {
-
-               var selected = getSelectedFeedsFromBrowser();
-
-               if (selected.length > 0) {
-
-                       var pr = __("Remove selected feeds from the archive? Feeds with stored articles will not be removed.");
-
-                       if (confirm(pr)) {
-                               Element.show('feed_browser_spinner');
-
-                               var query = "?op=rpc&subop=remarchived&ids=" + 
-                                       param_escape(selected.toString());;
-
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) { 
-                                               updateFeedBrowser();
-                                       } }); 
-                       }
-
-               } else {
-                       alert(__("No feeds are selected."));
-               }
-
-       } catch (e) {
-               exception_error("feedArchiveRemove", e);
-       }
-}
 
 function uploadIconHandler(rc) {
        try {
@@ -1162,7 +831,7 @@ function addLabel(select, callback) {
                                        if (callback) {
                                                callback(transport);
                                        } else if (inPreferences()) {
-                                               infobox_submit_callback2(transport);
+                                               updateLabelList();
                                        } else {
                                                updateFeedList();
                                        }
@@ -1176,13 +845,162 @@ function addLabel(select, callback) {
 }
 
 function quickAddFeed() {
-       displayDlg('quickAddFeed', '',
-          function () {$('feed_url').focus();});
+       try {
+               var query = "backend.php?op=dlg&id=quickAddFeed";
+
+               if (dijit.byId("feedAddDlg"))
+                       dijit.byId("feedAddDlg").destroyRecursive();
+
+               var dialog = new dijit.Dialog({
+                       id: "feedAddDlg",
+                       title: __("Subscribe to Feed"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       console.log(dojo.objectToQuery(this.attr('value')));
+
+                                       var feed_url = this.attr('value').feed;
+
+                                       notify_progress(__("Subscribing to feed..."), true);
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: dojo.objectToQuery(this.attr('value')),
+                                               onComplete: function(transport) { 
+                                                       try {
+
+                                                               var reply = JSON.parse(transport.responseText);
+                               
+                                                               var rc = parseInt(reply['result']);
+                                       
+                                                               notify('');
+
+                                                               console.log("GOT RC: " + rc);
+                                       
+                                                               switch (rc) {
+                                                               case 1:
+                                                                       dialog.hide();
+                                                                       notify_info(__("Subscribed to %s").replace("%s", feed_url));
+                                       
+                                                                       updateFeedList();
+                                                                       break;
+                                                               case 2:
+                                                                       alert(__("Specified URL seems to be invalid."));
+                                                                       break;
+                                                               case 3:
+                                                                       alert(__("Specified URL doesn't seem to contain any feeds."));
+                                                                       break;
+                                                               case 4:
+                                                                       notify_progress("Searching for feed urls...", true);
+
+                                                                       new Ajax.Request("backend.php", {
+                                                                               parameters: 'op=rpc&subop=extractfeedurls&url=' + param_escape(feed_url),
+                                                                               onComplete: function(transport, dialog, feed_url) {
+
+                                                                                       notify('');
+
+                                                                                       var reply = JSON.parse(transport.responseText);
+
+                                                                                       var feeds = reply['urls'];
+
+                                                                                       console.log(transport.responseText);
+
+                                                                                       var select = dijit.byId("feedDlg_feedContainerSelect");
+
+                                                                                       while (select.getOptions().length > 0)
+                                                                                               select.removeOption(0);
+
+                                                                                       var count = 0;
+                                                                                       for (var feedUrl in feeds) {
+                                                                                               select.addOption({value: feedUrl, label: feeds[feedUrl]});
+                                                                                               count++;
+                                                                                       }
+
+//                                                                                     if (count > 5) count = 5;
+//                                                                                     select.size = count; 
+                                       
+                                                                                       Effect.Appear('feedDlg_feedsContainer', {duration : 0.5}); 
+                                                                               }
+                                                                       });
+                                                                       break;
+                                                               case 5:
+                                                                       alert(__("Couldn't download the specified URL."));
+                                                                       break;
+                                                               case 0:
+                                                                       alert(__("You are already subscribed to this feed."));
+                                                                       break;
+                                                               }
+                               
+                                                       } catch (e) {
+                                                               exception_error("subscribeToFeed", e);
+                                                       }
+                               
+                                               } });
+
+                                       }
+                       },
+                       href: query});
+
+               dialog.show();
+       } catch (e) {
+               exception_error("quickAddFeed", e);
+       }
 }
 
 function quickAddFilter() {
-       displayDlg('quickAddFilter', '',
-          function () {document.forms['filter_add_form'].reg_exp.focus();});
+       try {
+               var query = "backend.php?op=dlg&id=quickAddFilter";
+
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "filterEditDlg",
+                       title: __("Create Filter"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+
+                                       var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + 
+                                               param_escape(dialog.attr('value').reg_exp);
+
+                                       notify_progress("Verifying regular expression...");
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       var reply = JSON.parse(transport.responseText); 
+
+                                                       if (reply) {
+                                                               notify('');
+
+                                                               if (!reply['status']) {
+                                                                       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();
+                                                                                       notify_info(transport.responseText);
+                                                                                       if (inPreferences()) {
+                                                                                               updateFilterList();                             
+                                                                                       }
+                                                                       }})
+                                                               }       
+                                                       }
+                                       }});
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+       } catch (e) {
+               exception_error("quickAddFilter", e);
+       }
 }
 
 function unsubscribeFeed(feed_id, title) {
@@ -1198,12 +1016,13 @@ function unsubscribeFeed(feed_id, title) {
                        parameters: query,
                        onComplete: function(transport) {
 
-                                       closeInfoBox();
-
+                                       if (dijit.byId("feedEditDlg")) dijit.byId("feedEditDlg").hide();
+               
                                        if (inPreferences()) {
                                                updateFeedList();                               
                                        } else {
-                                               dlg_frefresh_callback(transport, feed_id);
+                                               if (feed_id == getActiveFeedId())
+                                                       setTimeout("viewfeed(-5)", 100);
                                        }
 
                                } });
@@ -1274,17 +1093,16 @@ function backend_sanity_check_callback(transport) {
 }
 
 function has_local_storage() {
-       return false;
-/*     try {
-               return 'localStorage' in window && window['localStorage'] != null;
+       try {
+               return 'sessionStorage' in window && window['sessionStorage'] != null;
        } catch (e) {
                return false;
-       } */
+       } 
 }
 
 function catSelectOnChange(elem) {
        try {
-               var value = elem[elem.selectedIndex].value;
+/*             var value = elem[elem.selectedIndex].value;
                var def = elem.getAttribute('default');
 
                if (value == "ADD_CAT") {
@@ -1295,7 +1113,7 @@ function catSelectOnChange(elem) {
                                elem.selectedIndex = 0;
 
                        quickAddCat(elem);
-               }
+               } */
 
        } catch (e) {
                exception_error("catSelectOnChange", e);
@@ -1347,14 +1165,13 @@ function genUrlChangeKey(feed, is_cat) {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) {
-                                               var new_link = transport.responseXML.getElementsByTagName("link")[0];
+                                               var reply = JSON.parse(transport.responseText);
+                                               var new_link = reply.link;
        
                                                var e = $('gen_feed_url');
        
                                                if (new_link) {
                                                        
-                                                       new_link = new_link.firstChild.nodeValue;
-
                                                        e.innerHTML = e.innerHTML.replace(/\&amp;key=.*$/, 
                                                                "&amp;key=" + new_link);
 
@@ -1378,7 +1195,7 @@ function genUrlChangeKey(feed, is_cat) {
 
 function labelSelectOnChange(elem) {
        try {
-               var value = elem[elem.selectedIndex].value;
+/*             var value = elem[elem.selectedIndex].value;
                var def = elem.getAttribute('default');
 
                if (value == "ADD_LABEL") {
@@ -1403,7 +1220,7 @@ function labelSelectOnChange(elem) {
                                                exception_error("addLabel", e);
                                        }
                        });
-               }
+               } */
 
        } catch (e) {
                exception_error("labelSelectOnChange", e);
@@ -1517,3 +1334,168 @@ function getSelectedTableRowIds(id) {
        return rows;
 }
 
+function editFeed(feed, event) {
+       try {
+               if (feed <= 0)
+                       return alert(__("You can't edit this kind of feed."));
+
+               var query = "backend.php?op=pref-feeds&subop=editfeed&id=" +
+                       param_escape(feed);
+
+               console.log(query);
+
+               if (dijit.byId("feedEditDlg"))
+                       dijit.byId("feedEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "feedEditDlg",
+                       title: __("Edit Feed"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+//                                     console.log(dojo.objectToQuery(this.attr('value')));
+
+                                       notify_progress("Saving data...", true);
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: dojo.objectToQuery(dialog.attr('value')),
+                                               onComplete: function(transport) {
+                                                       dialog.hide();
+                                                       notify('');
+                                                       updateFeedList();
+                                       }})
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("editFeed", e);
+       }
+}
+
+function feedBrowser() {
+       try {
+               var query = "backend.php?op=dlg&id=feedBrowser";
+
+               if (dijit.byId("feedAddDlg"))
+                       dijit.byId("feedAddDlg").hide();
+
+               if (dijit.byId("feedBrowserDlg"))
+                       dijit.byId("feedBrowserDlg").destroyRecursive();
+
+               var dialog = new dijit.Dialog({
+                       id: "feedBrowserDlg",
+                       title: __("More Feeds"),
+                       style: "width: 600px",
+                       getSelectedFeeds: function() {
+                               var list = $$("#browseFeedList li[id*=FBROW]");
+                               var selected = new Array();
+                       
+                               list.each(function(child) {     
+                                       var id = child.id.replace("FBROW-", "");
+                       
+                                       if (child.hasClassName('Selected')) {
+                                               selected.push(id);
+                                       }       
+                               });
+                       
+                               return selected;
+                       },
+                       subscribe: function() {
+                               var selected = this.getSelectedFeeds();
+                               var mode = this.attr('value').mode;
+               
+                               if (selected.length > 0) {
+                                       dijit.byId("feedBrowserDlg").hide();
+               
+                                       notify_progress("Loading, please wait...", true);
+               
+                                       var query = "?op=rpc&subop=massSubscribe&ids="+
+                                               param_escape(selected.toString()) + "&mode=" + param_escape(mode);
+
+                                       console.log(query);
+               
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) { 
+                                                       if (inPreferences()) {
+                                                               updateFeedList();
+                                                       }
+                                               } });
+               
+                               } else {
+                                       alert(__("No feeds are selected."));
+                               }
+               
+                       },
+                       update: function() {
+                               var query = dojo.objectToQuery(dialog.attr('value'));
+               
+                               Element.show('feed_browser_spinner');
+               
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) { 
+                                               notify('');
+               
+                                               Element.hide('feed_browser_spinner');
+               
+                                               var c = $("browseFeedList");
+
+                                               var reply = JSON.parse(transport.responseText);
+
+                                               var r = reply['content'];
+                                               var mode = reply['mode'];
+               
+                                               if (c && r) {
+                                                       c.innerHTML = r;
+                                               }
+               
+                                               dojo.parser.parse("browseFeedList");
+               
+                                               if (mode == 2) {
+                                                       Element.show(dijit.byId('feed_archive_remove').domNode);
+                                               } else {
+                                                       Element.hide(dijit.byId('feed_archive_remove').domNode);
+                                               }
+                       
+                                       } });
+                       },
+                       removeFromArchive: function() {
+                               var selected = this.getSelectedFeeds();
+               
+                               if (selected.length > 0) {
+               
+                                       var pr = __("Remove selected feeds from the archive? Feeds with stored articles will not be removed.");
+               
+                                       if (confirm(pr)) {
+                                               Element.show('feed_browser_spinner');
+               
+                                               var query = "?op=rpc&subop=remarchived&ids=" + 
+                                                       param_escape(selected.toString());;
+               
+                                               new Ajax.Request("backend.php", {
+                                                       parameters: query,
+                                                       onComplete: function(transport) { 
+                                                               dialog.update();
+                                                       } }); 
+                                       }
+                               }
+                       },
+                       execute: function() {
+                               if (this.validate()) {
+                                       this.subscribe();
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("editFeed", e);
+       }
+}
+
+