]> git.wh0rd.org - tt-rss.git/blobdiff - functions.js
fix fatalError() not working properly
[tt-rss.git] / functions.js
index 946e29a9a9512917b226168a6910875857e6cb0b..88365d70a555df4bbde50c7e37eba40f487d22de 100644 (file)
@@ -1,4 +1,3 @@
-var hotkeys_enabled = true;
 var notify_silent = false;
 var loading_progress = 0;
 var sanity_check_done = false;
@@ -42,10 +41,6 @@ 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
@@ -84,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); 
@@ -398,8 +384,6 @@ function closeErrorBox() {
        if (Element.visible("errorBoxShadow")) {
                Element.hide("dialog_overlay");
                Element.hide("errorBoxShadow");
-
-               enableHotkeys();
        }
 
        return false;
@@ -407,8 +391,6 @@ function closeErrorBox() {
 
 function closeInfoBox(cleanup) {
        try {
-               enableHotkeys();
-
                dialog = dijit.byId("infoBox");
 
                if (dialog)     dialog.hide();
@@ -437,21 +419,6 @@ 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;
@@ -466,20 +433,15 @@ 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)
-                               title = 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;
 
-               } else {
-                       content = transport.responseText;
-               }
+               var content = transport.responseXML.getElementsByTagName("content")[0];
+               
+               content = content.firstChild.nodeValue;
 
                if (!dialog) {
                        dialog = new dijit.Dialog({
@@ -509,165 +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) { 
-                       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});
-                                               }
-                                       });
-                                       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;
@@ -700,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) {
@@ -710,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);
        }
@@ -804,19 +613,15 @@ function filterDlgCheckDate() {
                        parameters: query,
                        onComplete: function(transport) { 
 
-                               if (transport.responseXML) {
-                                       var result = transport.responseXML.getElementsByTagName("result")[0];
+                               var reply = JSON.parse(transport.responseText);
 
-                                       if (result && result.firstChild) {
-                                               if (result.firstChild.nodeValue == "1") {
-                                                       alert(__("Date syntax appears to be correct."));
-                                                       return;
-                                               }
-                                       }
+                               if (reply['result'] == true) {
+                                       alert(__("Date syntax appears to be correct."));
+                                       return;
+                               } else {
+                                       alert(__("Date syntax is incorrect."));
                                }
 
-                               alert(__("Date syntax is incorrect."));
-
                        } });
 
 
@@ -862,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) {
@@ -976,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 {
@@ -1153,7 +831,7 @@ function addLabel(select, callback) {
                                        if (callback) {
                                                callback(transport);
                                        } else if (inPreferences()) {
-                                               infobox_submit_callback2(transport);
+                                               updateLabelList();
                                        } else {
                                                updateFeedList();
                                        }
@@ -1167,8 +845,105 @@ 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() {
@@ -1193,15 +968,12 @@ function quickAddFilter() {
                                        new Ajax.Request("backend.php", {
                                                parameters: query,
                                                onComplete: function(transport) {
-                                                       handle_rpc_reply(transport);
-                                                       var response = transport.responseXML;
+                                                       var reply = JSON.parse(transport.responseText); 
 
-                                                       if (response) {
-                                                               var s = response.getElementsByTagName("status")[0].firstChild.nodeValue;
-       
+                                                       if (reply) {
                                                                notify('');
 
-                                                               if (s == "INVALID") {
+                                                               if (!reply['status']) {
                                                                        alert("Match regular expression seems to be invalid.");
                                                                        return;
                                                                } else {
@@ -1244,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);
                                        }
 
                                } });
@@ -1320,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") {
@@ -1341,7 +1113,7 @@ function catSelectOnChange(elem) {
                                elem.selectedIndex = 0;
 
                        quickAddCat(elem);
-               }
+               } */
 
        } catch (e) {
                exception_error("catSelectOnChange", e);
@@ -1393,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);
 
@@ -1563,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);
+       }
+}
+
+