]> git.wh0rd.org - tt-rss.git/blobdiff - functions.js
rework loading progressbar
[tt-rss.git] / functions.js
index 7901c00f32ccdc256f2359b381e0aee592ea22a1..48a9ef230fed360a1fd0a13ad28d2b76cbd44e66 100644 (file)
@@ -1,7 +1,7 @@
 var hotkeys_enabled = true;
 var notify_silent = false;
-var last_progress_point = 0;
-var async_counters_work = false;
+var loading_progress = 0;
+var sanity_check_done = false;
 
 /* add method to remove element from array */
 
@@ -11,45 +11,54 @@ Array.prototype.remove = function(s) {
        }
 }
 
-function is_opera() {
-       return window.opera;
-}
+/* create console.log if it doesn't exist */
+
+if (!window.console) console = {};
+console.log = console.log || function(msg) { };
+console.warn = console.warn || function(msg) { };
+console.error = console.error || function(msg) { };
 
 function exception_error(location, e, ext_info) {
        var msg = format_exception_error(location, e);
 
-       if (!ext_info) ext_info = "N/A";
-
-       disableHotkeys();
+       if (!ext_info) ext_info = false;
 
        try {
 
-               var ebc = $("xebContent");
-       
-               if (ebc) {
-       
-                       Element.show("dialog_overlay");
-                       Element.show("errorBoxShadow");
-       
-                       if (ext_info) {
-                               if (ext_info.responseText) {
-                                       ext_info = ext_info.responseText;
-                               }
+               if (ext_info) {
+                       if (ext_info.responseText) {
+                               ext_info = ext_info.responseText;
                        }
-       
-                       ebc.innerHTML = 
-                               "<div><b>Error message:</b></div>" +
-                               "<pre>" + msg + "</pre>" +
-                               "<div><b>Additional information:</b></div>" +
-                               "<textarea readonly=\"1\">" + ext_info + "</textarea>";
-       
-               } else {
-                       alert(msg);
                }
 
+               var content = "<div class=\"fatalError\">" +
+                       "<pre>" + msg + "</pre>";
+
+               if (ext_info) {
+                       content += "<div><b>Additional information:</b></div>" +
+                       "<textarea readonly=\"1\">" + ext_info + "</textarea>";
+               }
+
+               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
+
+               var dialog = new dijit.Dialog({
+                       title: "Unhandled exception",
+                       style: "width: 600px",
+                       content: content});
+
+               dialog.show();
+
        } catch (e) {
                alert(msg);
-
        }
 
 }
@@ -70,7 +79,7 @@ function format_exception_error(location, e) {
                msg = "Exception: " + e + "\nFunction: " + location + "()";
        }
 
-       debug("<b>EXCEPTION: " + msg + "</b>");
+       console.error("EXCEPTION: " + msg);
 
        return msg;
 }
@@ -98,15 +107,6 @@ function param_unescape(arg) {
                return unescape(arg);
 }
 
-function delay(gap) {
-       var then,now; 
-       then=new Date().getTime();
-       now=then;
-       while((now-then)<gap) {
-               now=new Date().getTime();
-       }
-}
-
 var notify_hide_timerid = false;
 
 function hide_notify() {
@@ -197,113 +197,6 @@ function notify_info(msg, no_hide) {
        notify_real(msg, no_hide, 4);
 }
 
-function printLockingError() {
-       notify_info("Please wait until operation finishes.");
-}
-
-function cleanSelected(element) {
-       var content = $(element);
-
-       for (i = 0; i < content.rows.length; i++) {
-               content.rows[i].className = content.rows[i].className.replace("Selected", "");
-       }
-}
-
-function getVisibleUnreadHeadlines() {
-       var content = $("headlinesList");
-
-       var rows = new Array();
-
-       if (!content) return rows;
-
-       for (i = 0; i < content.rows.length; i++) {
-               var row_id = content.rows[i].id.replace("RROW-", "");
-               if (row_id.length > 0 && content.rows[i].className.match("Unread")) {
-                               rows.push(row_id);      
-               }
-       }
-       return rows;
-}
-
-function getVisibleHeadlineIds() {
-
-       var content = $("headlinesList");
-
-       var rows = new Array();
-
-       if (!content) return rows;
-
-       for (i = 0; i < content.rows.length; i++) {
-               var row_id = content.rows[i].id.replace("RROW-", "");
-               if (row_id.length > 0) {
-                               rows.push(row_id);      
-               }
-       }
-       return rows;
-}
-
-function getFirstVisibleHeadlineId() {
-       if (isCdmMode()) {
-               var rows = cdmGetVisibleArticles();
-               return rows[0];
-       } else {
-               var rows = getVisibleHeadlineIds();
-               return rows[0];
-       }
-}
-
-function getLastVisibleHeadlineId() {
-       if (isCdmMode()) {
-               var rows = cdmGetVisibleArticles();
-               return rows[rows.length-1];
-       } else {
-               var rows = getVisibleHeadlineIds();
-               return rows[rows.length-1];
-       }
-}
-
-function markHeadline(id) {
-       var row = $("RROW-" + id);
-       if (row) {
-               var is_active = false;
-       
-               if (row.className.match("Active")) {
-                       is_active = true;
-               }
-               row.className = row.className.replace("Selected", "");
-               row.className = row.className.replace("Active", "");
-               row.className = row.className.replace("Insensitive", "");
-               
-               if (is_active) {
-                       row.className = row.className = "Active";
-               }
-               
-               var check = $("RCHK-" + id);
-
-               if (check) {
-                       check.checked = true;
-               }
-
-               row.className = row.className + "Selected"; 
-               
-       }
-}
-
-function getFeedIds() {
-       var content = $("feedsList");
-
-       var rows = new Array();
-
-       for (i = 0; i < content.rows.length; i++) {
-               var id = content.rows[i].id.replace("FEEDR-", "");
-               if (id.length > 0) {
-                       rows.push(id);
-               }
-       }
-
-       return rows;
-}
-
 function setCookie(name, value, lifetime, path, domain, secure) {
        
        var d = false;
@@ -313,7 +206,7 @@ function setCookie(name, value, lifetime, path, domain, secure) {
                d.setTime(d.getTime() + (lifetime * 1000));
        }
 
-       debug("setCookie: " + name + " => " + value + ": " + d);
+       console.log("setCookie: " + name + " => " + value + ": " + d);
        
        int_setCookie(name, value, d, path, domain, secure);
 
@@ -368,935 +261,247 @@ function gotoExportOpml() {
        document.location.href = "opml.php?op=Export";
 }
 
-function parse_counters(reply, scheduled_call) {
-       try {
-
-               var feeds_found = 0;
 
-               var elems = reply.getElementsByTagName("counter");
-
-               for (var l = 0; l < elems.length; l++) {
-
-                       var id = elems[l].getAttribute("id");
-                       var t = elems[l].getAttribute("type");
-                       var ctr = elems[l].getAttribute("counter");
-                       var error = elems[l].getAttribute("error");
-                       var has_img = elems[l].getAttribute("hi");
-                       var updated = elems[l].getAttribute("updated");
-                       var title = elems[l].getAttribute("title");
-                       var xmsg = elems[l].getAttribute("xmsg");
-       
-                       if (id == "global-unread") {
+/** * @(#)isNumeric.js * * Copyright (c) 2000 by Sundar Dorai-Raj
+  * * @author Sundar Dorai-Raj
+  * * Email: sdoraira@vt.edu
+  * * This program is free software; you can redistribute it and/or
+  * * modify it under the terms of the GNU General Public License 
+  * * as published by the Free Software Foundation; either version 2 
+  * * of the License, or (at your option) any later version, 
+  * * provided that any use properly credits the author. 
+  * * This program is distributed in the hope that it will be useful,
+  * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  * * GNU General Public License for more details at http://www.gnu.org * * */
 
-                               if (ctr > global_unread) {
-                                       offlineDownloadStart(1);
-                               }
+  var numbers=".0123456789";
+  function isNumeric(x) {
+    // is x a String or a character?
+    if(x.length>1) {
+      // remove negative sign
+      x=Math.abs(x)+"";
+      for(j=0;j<x.length;j++) {
+        // call isNumeric recursively for each character
+        number=isNumeric(x.substring(j,j+1));
+        if(!number) return number;
+      }
+      return number;
+    }
+    else {
+      // if x is number return true
+      if(numbers.indexOf(x)>=0) return true;
+      return false;
+    }
+  }
 
-                               global_unread = ctr;
-                               updateTitle();
-                               continue;
-                       }
 
-                       if (id == "subscribed-feeds") {
-                               feeds_found = ctr;
-                               continue;
-                       }
-       
-                       if (t == "category") {
-                               var catctr = $("FCATCTR-" + id);
-                               if (catctr) {
-                                       catctr.innerHTML = "(" + ctr + ")";
-                                       if (ctr > 0) {
-                                               catctr.className = "catCtrHasUnread";
-                                       } else {
-                                               catctr.className = "catCtrNoUnread";
-                                       }
-                               }
-                               continue;
-                       }
-               
-                       var feedctr = $("FEEDCTR-" + id);
-                       var feedu = $("FEEDU-" + id);
-                       var feedr = $("FEEDR-" + id);
-                       var feed_img = $("FIMG-" + id);
-                       var feedlink = $("FEEDL-" + id);
-                       var feedupd = $("FLUPD-" + id);
-
-                       if (updated && feedlink) {
-                               if (error) {
-                                       feedlink.title = "Error: " + error + " (" + updated + ")";
-                               } else {
-                                       feedlink.title = "Updated: " + updated;
-                               }
-                       }
+function toggleSelectRowById(sender, id) {
+       var row = $(id);
+       return toggleSelectRow(sender, row);
+}
 
-                       if (feedupd) {
-                               if (!updated) updated = "";
+function toggleSelectListRow(sender) {
+       var row = sender.parentNode;
+       return toggleSelectRow(sender, row);
+}
 
-                               if (error) {
-                                       if (xmsg) {
-                                               feedupd.innerHTML = updated + " " + xmsg + " (Error)";
-                                       } else {
-                                               feedupd.innerHTML = updated + " (Error)";
-                                       }
-                               } else {
-                                       if (xmsg) {
-                                               feedupd.innerHTML = updated + " " + xmsg;
-                                       } else {
-                                               feedupd.innerHTML = updated;
-                                       }
-                               }
-                       }
+/* this is for dijit Checkbox */
+function toggleSelectListRow2(sender) {
+       var row = sender.domNode.parentNode;
+       return toggleSelectRow(sender, row);
+}
 
-                       if (has_img && feed_img) {
-                               if (!feed_img.src.match(id + ".ico")) {
-                                       feed_img.src = getInitParam("icons_location") + "/" + id + ".ico";
-                               }
-                       }
+function tSR(sender, row) {
+       return toggleSelectRow(sender, row);
+}
 
-                       if (feedlink && title) {
-                               feedlink.innerHTML = title;
-                       }
+/* this is for dijit Checkbox */
+function toggleSelectRow2(sender, row) {
 
-                       if (feedctr && feedu && feedr) {
+       if (!row) row = sender.domNode.parentNode.parentNode;
 
-                               if (parseInt(ctr) > 0 && 
-                                               parseInt(feedu.innerHTML) < parseInt(ctr) && 
-                                               id == getActiveFeedId() && scheduled_call) {
+       if (sender.checked && !row.hasClassName('Selected'))
+               row.addClassName('Selected');
+       else
+               row.removeClassName('Selected');
+}
 
-                                       displayNewContentPrompt(id);
-                               }
 
-                               var row_needs_hl = (ctr > 0 && ctr > parseInt(feedu.innerHTML));
+function toggleSelectRow(sender, row) {
 
-                               feedu.innerHTML = ctr;
+       if (!row) row = sender.parentNode.parentNode;
 
-                               if (error) {
-                                       feedr.className = feedr.className.replace("feed", "error");
-                               } else if (id > 0) {
-                                       feedr.className = feedr.className.replace("error", "feed");
-                               }
-       
-                               if (ctr > 0) {                                  
-                                       feedctr.className = "feedCtrHasUnread";
-                                       if (!feedr.className.match("Unread")) {
-                                               var is_selected = feedr.className.match("Selected");
-               
-                                               feedr.className = feedr.className.replace("Selected", "");
-                                               feedr.className = feedr.className.replace("Unread", "");
-               
-                                               feedr.className = feedr.className + "Unread";
-               
-                                               if (is_selected) {
-                                                       feedr.className = feedr.className + "Selected";
-                                               }       
-                                               
-                                       }
+       if (sender.checked && !row.hasClassName('Selected'))
+               row.addClassName('Selected');
+       else
+               row.removeClassName('Selected');
+}
 
-                                       if (row_needs_hl && 
-                                                       !getInitParam("theme_options").match('no_highlights')) { 
-                                               new Effect.Highlight(feedr, {duration: 1, startcolor: "#fff7d5",
-                                                       queue: { position:'end', scope: 'EFQ-' + id, limit: 1 } } );
+function checkboxToggleElement(elem, id) {
+       if (elem.checked) {
+               Effect.Appear(id, {duration : 0.5});
+       } else {
+               Effect.Fade(id, {duration : 0.5});
+       }
+}
 
-                                               cache_invalidate("F:" + id);
-                                       }
-                               } else {
-                                       feedctr.className = "feedCtrNoUnread";
-                                       feedr.className = feedr.className.replace("Unread", "");
-                               }                       
-                       }
+function dropboxSelect(e, v) {
+       for (i = 0; i < e.length; i++) {
+               if (e[i].value == v) {
+                       e.selectedIndex = i;
+                       break;
                }
+       }
+}
 
-               hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
-
-               var feeds_stored = number_of_feeds;
-
-               debug("Feed counters, C: " + feeds_found + ", S:" + feeds_stored);
+// originally stolen from http://www.11tmr.com/11tmr.nsf/d6plinks/MWHE-695L9Z
+// bugfixed just a little bit :-)
+function getURLParam(strParamName){
+  var strReturn = "";
+  var strHref = window.location.href;
 
-               if (feeds_stored != feeds_found) {
-                       number_of_feeds = feeds_found;
+  if (strHref.indexOf("#") == strHref.length-1) {
+               strHref = strHref.substring(0, strHref.length-1);
+  }
 
-                       if (feeds_stored != 0 && feeds_found != 0) {
-                               debug("Subscribed feed number changed, refreshing feedlist");
-                               setTimeout('updateFeedList(false, false)', 50);
-                       }
-               } else {
-/*                     var fl = $("feeds-frame").innerHTML;
-                       if (fl) {
-                               cache_invalidate("FEEDLIST");
-                               cache_inject("FEEDLIST", fl, getInitParam("num_feeds"));
-                       } */
-               }
+  if ( strHref.indexOf("?") > -1 ){
+    var strQueryString = strHref.substr(strHref.indexOf("?"));
+    var aQueryString = strQueryString.split("&");
+    for ( var iParam = 0; iParam < aQueryString.length; iParam++ ){
+      if (aQueryString[iParam].indexOf(strParamName + "=") > -1 ){
+        var aParam = aQueryString[iParam].split("=");
+        strReturn = aParam[1];
+        break;
+      }
+    }
+  }
+  return strReturn;
+} 
 
-       } catch (e) {
-               exception_error("parse_counters", e);
-       }
+function leading_zero(p) {
+       var s = String(p);
+       if (s.length == 1) s = "0" + s;
+       return s;
 }
 
-function parse_counters_reply(transport, scheduled_call) {
+function make_timestamp() {
+       var d = new Date();
 
-       if (!transport.responseXML) {
-               notify_error("Backend did not return valid XML", true);
-               return;
-       }
-
-       var reply = transport.responseXML.firstChild;
-       
-       if (!reply) {
-               notify_error("Backend did not return expected XML object", true);
-               updateTitle("");
-               return;
-       } 
-
-       if (!transport_error_check(transport)) return;
+       return leading_zero(d.getHours()) + ":" + leading_zero(d.getMinutes()) +
+                       ":" + leading_zero(d.getSeconds());
+}
 
-       var counters = reply.getElementsByTagName("counters")[0];
-       
-       parse_counters(counters, scheduled_call);
 
-       var runtime_info = reply.getElementsByTagName("runtime-info")[0];
+function closeErrorBox() {
 
-       parse_runtime_info(runtime_info);
+       if (Element.visible("errorBoxShadow")) {
+               Element.hide("dialog_overlay");
+               Element.hide("errorBoxShadow");
 
-       if (feedsSortByUnread()) {
-               resort_feedlist();
+               enableHotkeys();
        }
 
-       hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
-
+       return false;
 }
 
-function all_counters_callback2(transport, async_call) {
+function closeInfoBox(cleanup) {
        try {
-               if (async_call) async_counters_work = true;
-               
-               if (offline_mode) return;
+               enableHotkeys();
 
-               debug("<b>all_counters_callback2 IN: " + transport + "</b>");
-               parse_counters_reply(transport);
-               debug("<b>all_counters_callback2 OUT: " + transport + "</b>");
+               dialog = dijit.byId("infoBox");
 
-       } catch (e) {
-               exception_error("all_counters_callback2", e, transport);
-       }
-}
+               if (dialog)     dialog.hide();
 
-function get_feed_unread(id) {
-       try {
-               return parseInt($("FEEDU-" + id).innerHTML);    
        } catch (e) {
-               return -1;
+               //exception_error("closeInfoBox", e);
        }
+       return false;
 }
 
-function get_cat_unread(id) {
-       try {
-               var ctr = $("FCATCTR-" + id).innerHTML;
-               ctr = ctr.replace("(", "");
-               ctr = ctr.replace(")", "");
-               return parseInt(ctr);
-       } catch (e) {
-               return -1;
-       }
-}
 
-function get_feed_entry_unread(elem) {
+function displayDlg(id, param, callback) {
 
-       var id = elem.id.replace("FEEDR-", "");
+       notify_progress("Loading, please wait...", true);
 
-       if (id <= 0) {
-               return -1;
-       }
+       var query = "?op=dlg&id=" +
+               param_escape(id) + "&param=" + param_escape(param);
 
-       try {
-               return parseInt($("FEEDU-" + id).innerHTML);    
-       } catch (e) {
-               return -1;
-       }
-}
+       new Ajax.Request("backend.php", {
+               parameters: query,
+               onComplete: function (transport) {
+                       infobox_callback2(transport);
+                       if (callback) callback(transport);
+               } });
 
-function get_feed_entry_name(elem) {
-       var id = elem.id.replace("FEEDR-", "");
-       return getFeedName(id);
+       return false;
 }
 
-
-function resort_category(node, cat_mode) {
+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) { }
 
-               debug("resort_category: " + node + " CM=" + cat_mode);
-       
-               var by_unread = feedsSortByUnread();
-       
-               var list = node.getElementsByTagName("LI");
-       
-               for (i = 0; i < list.length; i++) {
-       
-                       for (j = i+1; j < list.length; j++) {                   
-       
-                               var tmp_val = get_feed_entry_unread(list[i]);
-                               var cur_val = get_feed_entry_unread(list[j]);
-       
-                               var tmp_name = get_feed_entry_name(list[i]);
-                               var cur_name = get_feed_entry_name(list[j]);
-
-                               var valid_pair = cat_mode || (list[i].id.match(/FEEDR-[0-9]/) &&
-                                               list[j].id.match(/FEEDR-[0-9]/));
-
-                               if (valid_pair && ((by_unread && (cur_val > tmp_val)) || (!by_unread && (cur_name < tmp_name)))) {
-                                       tempnode_i = list[i].cloneNode(true);
-                                       tempnode_j = list[j].cloneNode(true);
-                                       node.replaceChild(tempnode_i, list[j]);
-                                       node.replaceChild(tempnode_j, list[i]);
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("resort_category", e);
-       }
-
-}
-
-function resort_feedlist() {
-       debug("resort_feedlist");
-
-       if ($("FCATLIST--1")) {
-
-               var lists = document.getElementsByTagName("UL");
-
-               for (var i = 0; i < lists.length; i++) {
-                       if (lists[i].id && lists[i].id.match("FCATLIST-")) {
-                               resort_category(lists[i], true);
-                       }
-               }
-
-       } else {
-               resort_category($("feedList"), false);
-       }
-}
-
-/** * @(#)isNumeric.js * * Copyright (c) 2000 by Sundar Dorai-Raj
-  * * @author Sundar Dorai-Raj
-  * * Email: sdoraira@vt.edu
-  * * This program is free software; you can redistribute it and/or
-  * * modify it under the terms of the GNU General Public License 
-  * * as published by the Free Software Foundation; either version 2 
-  * * of the License, or (at your option) any later version, 
-  * * provided that any use properly credits the author. 
-  * * This program is distributed in the hope that it will be useful,
-  * * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  * * GNU General Public License for more details at http://www.gnu.org * * */
-
-  var numbers=".0123456789";
-  function isNumeric(x) {
-    // is x a String or a character?
-    if(x.length>1) {
-      // remove negative sign
-      x=Math.abs(x)+"";
-      for(j=0;j<x.length;j++) {
-        // call isNumeric recursively for each character
-        number=isNumeric(x.substring(j,j+1));
-        if(!number) return number;
-      }
-      return number;
-    }
-    else {
-      // if x is number return true
-      if(numbers.indexOf(x)>=0) return true;
-      return false;
-    }
-  }
-
-
-function hideOrShowFeeds(hide) {
-
-       try {
-
-       debug("hideOrShowFeeds: " + hide);
-
-       if ($("FCATLIST--1")) {
-
-               var lists = document.getElementsByTagName("UL");
-
-               for (var i = 0; i < lists.length; i++) {
-                       if (lists[i].id && lists[i].id.match("FCATLIST-")) {
-
-                               var id = lists[i].id.replace("FCATLIST-", "");
-                               hideOrShowFeedsCategory(id, hide);
-                       }
-               }
-
-       } else {
-               hideOrShowFeedsCategory(null, hide);
-       }
-
-       } catch (e) {
-               exception_error("hideOrShowFeeds", e);
-       }
-}
-
-function hideOrShowFeedsCategory(id, hide) {
-
-       try {
-       
-               var node = null;
-               var cat_node = null;
-
-               if (id) {
-                       node = $("FCATLIST-" + id);
-                       cat_node = $("FCAT-" + id);
-               } else {
-                       node = $("feedList"); // no categories
-               }
-
-       //      debug("hideOrShowFeedsCategory: " + node + " (" + hide + ")");
-       
-               var cat_unread = 0;
-       
-               if (!node) {
-                       debug("hideOrShowFeeds: passed node is null, aborting");
-                       return;
-               }
-       
-       //      debug("cat: " + node.id);
-       
-               if (node.hasChildNodes() && node.firstChild.nextSibling != false) {  
-                       for (i = 0; i < node.childNodes.length; i++) {
-                               if (node.childNodes[i].nodeName != "LI") { continue; }
-       
-                               if (node.childNodes[i].style != undefined) {
-       
-                                       var has_unread = (node.childNodes[i].className != "feed" &&
-                                               node.childNodes[i].className != "label" && 
-                                               !(!getInitParam("hide_read_shows_special") && 
-                                                       node.childNodes[i].className == "virt") && 
-                                               node.childNodes[i].className != "error" && 
-                                               node.childNodes[i].className != "tag");
-               
-       //                              debug(node.childNodes[i].id + " --> " + has_unread);
-               
-                                       if (hide && !has_unread) {
-                                               //node.childNodes[i].style.display = "none";
-                                               var id = node.childNodes[i].id;
-                                               Effect.Fade(node.childNodes[i], {duration : 0.3, 
-                                                       queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
-                                       }
-               
-                                       if (!hide) {
-                                               node.childNodes[i].style.display = "list-item";
-                                               //Effect.Appear(node.childNodes[i], {duration : 0.3});
-                                       }
-               
-                                       if (has_unread) {
-                                               node.childNodes[i].style.display = "list-item";
-                                               cat_unread++;
-                                               //Effect.Appear(node.childNodes[i], {duration : 0.3});
-                                               //Effect.Highlight(node.childNodes[i]);
-                                       }
-                               }
-                       }
-               }       
-       
-       //      debug("end cat: " + node.id + " unread " + cat_unread);
-
-               if (cat_node) {
-
-                       if (cat_unread == 0) {
-                               if (cat_node.style == undefined) {
-                                       debug("ERROR: supplied cat_node " + cat_node + 
-                                               " has no styles. WTF?");
-                                       return;
-                               }
-                               if (hide) {
-                                       //cat_node.style.display = "none";
-                                       Effect.Fade(cat_node, {duration : 0.3, 
-                                               queue: { position: 'end', scope: 'CFADE-' + node.id, limit: 1 }});
-                               } else {
-                                       cat_node.style.display = "list-item";
-                               }
-                       } else {
-                               try {
-                                       cat_node.style.display = "list-item";
-                               } catch (e) {
-                                       debug(e);
-                               }
-                       }
-               }
-
-//     debug("unread for category: " + cat_unread);
-
-       } catch (e) {
-               exception_error("hideOrShowFeedsCategory", e);
-       }
-}
-
-function selectTableRow(r, do_select) {
-       r.className = r.className.replace("Selected", "");
-       
-       if (do_select) {
-               r.className = r.className + "Selected";
+       if (transport.responseText) {
+               notify_info(transport.responseText);
        }
 }
 
-function selectTableRowById(elem_id, check_id, do_select) {
-
+function infobox_callback2(transport) {
        try {
+               var dialog = false;
 
-               var row = $(elem_id);
-
-               if (row) {
-                       selectTableRow(row, do_select);
-               }               
-
-               var check = $(check_id);
-
-               if (check) {
-                       check.checked = do_select;
-               }
-       } catch (e) {
-               exception_error("selectTableRowById", e);
-       }
-}
-
-function selectTableRowsByIdPrefix(content_id, prefix, check_prefix, do_select, 
-       classcheck, reset_others) {
-
-       var content = $(content_id);
-
-       if (!content) {
-               debug("[selectTableRows] Element " + content_id + " not found.");
-               return;
-       }
-
-       for (i = 0; i < content.rows.length; i++) {
-               if (Element.visible(content.rows[i])) {
-                       if (!classcheck || content.rows[i].className.match(classcheck)) {
-               
-                               if (content.rows[i].id.match(prefix)) {
-                                       selectTableRow(content.rows[i], do_select);
-                               
-                                       var row_id = content.rows[i].id.replace(prefix, "");
-                                       var check = $(check_prefix + row_id);
-       
-                                       if (check) {
-                                               check.checked = do_select;
-                                       }
-                               } else if (reset_others) {
-                                       selectTableRow(content.rows[i], false);
-       
-                                       var row_id = content.rows[i].id.replace(prefix, "");
-                                       var check = $(check_prefix + row_id);
-       
-                                       if (check) {
-                                               check.checked = false;
-                                       }
-       
-                               }
-                       } else if (reset_others) {
-                               selectTableRow(content.rows[i], false);
-       
-                               var row_id = content.rows[i].id.replace(prefix, "");
-                               var check = $(check_prefix + row_id);
-       
-                               if (check) {
-                                       check.checked = false;
-                               }
-       
-                       }
-               }
-       }
-}
-
-function getSelectedTableRowIds(content_id, prefix) {
-
-       var content = $(content_id);
-
-       if (!content) {
-               debug("[getSelectedTableRowIds] Element " + content_id + " not found.");
-               return new Array();
-       }
-
-       var sel_rows = new Array();
-
-       for (i = 0; i < content.rows.length; i++) {
-               if (content.rows[i].id.match(prefix) && 
-                               content.rows[i].className.match("Selected")) {
-                               
-                       var row_id = content.rows[i].id.replace(prefix + "-", "");
-                       sel_rows.push(row_id);  
+               if (dijit.byId("infoBox")) {
+                       dialog = dijit.byId("infoBox");
                }
-       }
 
-       return sel_rows;
+               //console.log("infobox_callback2");
+               notify('');
 
-}
+               var content;
+               var dtitle = "Dialog";
 
-function toggleSelectRowById(sender, id) {
-       var row = $(id);
-
-       if (sender.checked) {
-               if (!row.className.match("Selected")) {
-                       row.className = row.className + "Selected";
-               }
-       } else {
-               if (row.className.match("Selected")) {
-                       row.className = row.className.replace("Selected", "");
-               }
-       }
-}
-
-function toggleSelectListRow(sender) {
-       var parent_row = sender.parentNode;
-
-       if (sender.checked) {
-               if (!parent_row.className.match("Selected")) {
-                       parent_row.className = parent_row.className + "Selected";
-               }
-       } else {
-               if (parent_row.className.match("Selected")) {
-                       parent_row.className = parent_row.className.replace("Selected", "");
-               }
-       }
-}
-
-function tSR(sender) {
-       return toggleSelectRow(sender);
-}
-
-function toggleSelectRow(sender) {
-       var parent_row = sender.parentNode.parentNode;
-
-       if (sender.checked) {
-               if (!parent_row.className.match("Selected")) {
-                       parent_row.className = parent_row.className + "Selected";
-               }
-       } else {
-               if (parent_row.className.match("Selected")) {
-                       parent_row.className = parent_row.className.replace("Selected", "");
-               }
-       }
-}
-
-function getNextUnreadCat(id) {
-       try {
-               var rows = $("feedList").getElementsByTagName("LI");
-               var feeds = new Array();
-
-               var unread_only = true;
-               var is_cat = true;
-
-               for (var i = 0; i < rows.length; i++) {
-                       if (rows[i].id.match("FCAT-")) {
-                               if (rows[i].id == "FCAT-" + id && is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
+               if (transport.responseXML) {
+                       var dlg = transport.responseXML.getElementsByTagName("dlg")[0];
 
-                                       var cat_id = parseInt(rows[i].id.replace("FCAT-", ""));
+                       var title = transport.responseXML.getElementsByTagName("title")[0];
+                       if (title)
+                               title = title.firstChild.nodeValue;
 
-                                       if (cat_id >= 0) {
-                                               if (!unread_only || get_cat_unread(cat_id) > 0) {
-                                                       feeds.push(cat_id);
-                                               }
-                                       }
-                               }
-                       }
-               }
+                       var content = transport.responseXML.getElementsByTagName("content")[0];
+                       
+                       content = content.firstChild.nodeValue;
 
-               var idx = feeds.indexOf(id);
-               if (idx != -1 && idx < feeds.length) {
-                       return feeds[idx+1];                                    
                } else {
-                       return feeds.shift();
+                       content = transport.responseText;
                }
 
-       } catch (e) {
-               exception_error("getNextUnreadCat", e);
-       }
-}
-
-function getRelativeFeedId2(id, is_cat, direction, unread_only) {      
-       try {
-
-//             alert(id + " IC: " + is_cat + " D: " + direction + " U: " + unread_only);
-
-               var rows = $("feedList").getElementsByTagName("LI");
-               var feeds = new Array();
-       
-               for (var i = 0; i < rows.length; i++) {
-                       if (rows[i].id.match("FEEDR-")) {
-       
-                               if (rows[i].id == "FEEDR-" + id && !is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
-       
-                                       if (!unread_only || 
-                                                       (rows[i].className.match("Unread") || rows[i].id == "FEEDR-" + id)) {
-                                               feeds.push(rows[i].id.replace("FEEDR-", ""));
-                                       }
-                               }
-                       }
-
-                       if (rows[i].id.match("FCAT-")) {
-                               if (rows[i].id == "FCAT-" + id && is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
-
-                                       var cat_id = parseInt(rows[i].id.replace("FCAT-", ""));
-
-                                       if (cat_id >= 0) {
-                                               if (!unread_only || get_cat_unread(cat_id) > 0) {
-                                                       feeds.push("CAT:"+cat_id);
-                                               }
-                                       }
-                               }
-                       }
-               }
-       
-//             alert(feeds.toString());
-
-               if (!id) {
-                       if (direction == "next") {
-                               return feeds.shift();
-                       } else {
-                               return feeds.pop();
-                       }
+               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 {
-                       if (direction == "next") {
-                               if (is_cat) id = "CAT:" + id;
-                               var idx = feeds.indexOf(id);
-                               if (idx != -1 && idx < feeds.length) {
-                                       return feeds[idx+1];                                    
-                               } else {
-                                       return getRelativeFeedId2(false, is_cat, direction, unread_only);
-                               }
-                       } else {
-                               if (is_cat) id = "CAT:" + id;
-                               var idx = feeds.indexOf(id);
-                               if (idx > 0) {
-                                       return feeds[idx-1];
-                               } else {
-                                       return getRelativeFeedId2(false, is_cat, direction, unread_only);
-                               }
-                       }
-       
+                       dialog.attr('title', title);
+                       dialog.attr('content', content);
                }
 
-       } catch (e) {
-               exception_error("getRelativeFeedId2", e);
-       }
-}
-
-function getRelativeFeedId(list, id, direction, unread_only) { 
-       var rows = list.getElementsByTagName("LI");
-       var feeds = new Array();
-
-       for (var i = 0; i < rows.length; i++) {
-               if (rows[i].id.match("FEEDR-")) {
-
-                       if (rows[i].id == "FEEDR-" + id || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
-
-                               if (!unread_only || 
-                                               (rows[i].className.match("Unread") || rows[i].id == "FEEDR-" + id)) {
-                                       feeds.push(rows[i].id.replace("FEEDR-", ""));
-                               }
-                       }
-               }
-       }
-
-       if (!id) {
-               if (direction == "next") {
-                       return feeds.shift();
-               } else {
-                       return feeds.pop();
-               }
-       } else {
-               if (direction == "next") {
-                       var idx = feeds.indexOf(id);
-                       if (idx != -1 && idx < feeds.length) {
-                               return feeds[idx+1];                                    
-                       } else {
-                               return getRelativeFeedId(list, false, direction, unread_only);
-                       }
-               } else {
-                       var idx = feeds.indexOf(id);
-                       if (idx > 0) {
-                               return feeds[idx-1];
-                       } else {
-                               return getRelativeFeedId(list, false, direction, unread_only);
-                       }
-               }
-
-       }
-}
-
-function showBlockElement(id, h_id) {
-       var elem = $(id);
-
-       if (elem) {
-               elem.style.display = "block";
-
-               if (h_id) {
-                       elem = $(h_id);
-                       if (elem) {
-                               elem.style.display = "none";
-                       }
-               }
-       } else {
-               alert("[showBlockElement] can't find element with id " + id);
-       } 
-}
-
-function appearBlockElement_afh(effect) {
-
-}
-
-function checkboxToggleElement(elem, id) {
-       if (elem.checked) {
-               Effect.Appear(id, {duration : 0.5});
-       } else {
-               Effect.Fade(id, {duration : 0.5});
-       }
-}
-
-function appearBlockElement(id, h_id) {
-
-       try {
-               if (h_id) {
-                       Effect.Fade(h_id);
-               }
-               Effect.SlideDown(id, {duration : 1.0, afterFinish: appearBlockElement_afh});
-       } catch (e) {
-               exception_error("appearBlockElement", e);
-       }
-
-}
-
-function hideParentElement(e) {
-       e.parentNode.style.display = "none";
-}
-
-function dropboxSelect(e, v) {
-       for (i = 0; i < e.length; i++) {
-               if (e[i].value == v) {
-                       e.selectedIndex = i;
-                       break;
-               }
-       }
-}
-
-// originally stolen from http://www.11tmr.com/11tmr.nsf/d6plinks/MWHE-695L9Z
-// bugfixed just a little bit :-)
-function getURLParam(strParamName){
-  var strReturn = "";
-  var strHref = window.location.href;
-
-  if (strHref.indexOf("#") == strHref.length-1) {
-               strHref = strHref.substring(0, strHref.length-1);
-  }
-
-  if ( strHref.indexOf("?") > -1 ){
-    var strQueryString = strHref.substr(strHref.indexOf("?"));
-    var aQueryString = strQueryString.split("&");
-    for ( var iParam = 0; iParam < aQueryString.length; iParam++ ){
-      if (aQueryString[iParam].indexOf(strParamName + "=") > -1 ){
-        var aParam = aQueryString[iParam].split("=");
-        strReturn = aParam[1];
-        break;
-      }
-    }
-  }
-  return strReturn;
-} 
-
-function leading_zero(p) {
-       var s = String(p);
-       if (s.length == 1) s = "0" + s;
-       return s;
-}
-
-function closeErrorBox() {
-
-       if (Element.visible("errorBoxShadow")) {
-               Element.hide("dialog_overlay");
-               Element.hide("errorBoxShadow");
-
-               enableHotkeys();
-       }
-
-       return false;
-}
-
-function closeInfoBox(cleanup) {
-
-       try {
-               enableHotkeys();
-
-               if (Element.visible("infoBoxShadow")) {
-                       Element.hide("dialog_overlay");
-                       Element.hide("infoBoxShadow");
-
-                       if (cleanup) $("infoBox").innerHTML = "&nbsp;";
-               }
-       } catch (e) {
-               exception_error("closeInfoBox", e);
-       }
-       
-       return false;
-}
-
-
-function displayDlg(id, param, callback) {
-
-       notify_progress("Loading, please wait...", true);
-
-       disableHotkeys();
-
-       var query = "?op=dlg&id=" +
-               param_escape(id) + "&param=" + param_escape(param);
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function (transport) {
-                       infobox_callback2(transport);
-                       if (callback) callback(transport);
-               } });
-
-       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 {
-
-               debug("infobox_callback2");
-
-               var box = $('infoBox');
-               
-               if (box) {                      
-
-                       if (!getInitParam("infobox_disable_overlay")) {
-                               Element.show("dialog_overlay");
-                       }
-
-                       box.innerHTML=transport.responseText;                   
-                       Element.show("infoBoxShadow");
-                       //Effect.SlideDown("infoBoxShadow", {duration : 1.0});
-
-
-               }
-
-               disableHotkeys();
+               dialog.show();
 
                notify("");
        } catch (e) {
@@ -1315,20 +520,45 @@ function createFilter() {
                        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;
        
-               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);
+                                               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;
+                                               }
+                                       }
+
                        } });
-               
-               return true;
 
        } catch (e) {
                exception_error("createFilter", e);
@@ -1355,39 +585,78 @@ function subscribeToFeed() {
 
        var query = Form.serialize("feed_add_form");
        
-       debug("subscribe q: " + query);
+       console.log("subscribe q: " + query);
 
        Form.disable("feed_add_form");
 
        new Ajax.Request("backend.php", {
                parameters: query,
                onComplete: function(transport) { 
-                       //dlg_frefresh_callback(transport); 
-
-                       notify('');
-
-                       var result = transport.responseXML.getElementsByTagName('result')[0];
-                       var rc = parseInt(result.getAttribute('code'));
+                       try {
 
-                       Form.enable("feed_add_form");
-
-                       switch (rc) {
-                       case 1:
-                               closeInfoBox();
-                               notify_info(__("Subscribed to %s").replace("%s", feed_url));
+                               if (!transport.responseXML) {
+                                       console.log(transport.responseText);
+                                       alert(__("Server error while trying to subscribe to specified feed."));
+                                       return;
+                               }
 
-                               if (inPreferences()) {
-                                       updateFeedList();
-                               } else {
-                                       setTimeout('updateFeedList(false, false)', 50);
+                               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;
                                }
-                               break;
-                       case 2:
-                               alert(__("Can't subscribe to the specified URL."));
-                               break;
-                       case 0:
-                               alert(__("You are already subscribed to this feed."));
-                               break;
+
+                       } catch (e) {
+                               exception_error("subscribeToFeed", e);
                        }
 
                } });
@@ -1413,34 +682,10 @@ function filterCR(e, f)
                        f();
                        return false;
                } else {
-                       return false;
-               }
-       } else {
-               return true;
-       }
-}
-
-var debug_last_class = "even";
-
-function debug(msg) {
-
-       if (debug_last_class == "even") {
-               debug_last_class = "odd";
-       } else {
-               debug_last_class = "even";
-       }
-
-       var c = $('debug_output');
-       if (c && Element.visible(c)) {
-               while (c.lastChild != 'undefined' && c.childNodes.length > 100) {
-                       c.removeChild(c.lastChild);
+                       return false;
                }
-       
-               var d = new Date();
-               var ts = leading_zero(d.getHours()) + ":" + leading_zero(d.getMinutes()) +
-                       ":" + leading_zero(d.getSeconds());
-               c.innerHTML = "<li class=\"" + debug_last_class + "\"><span class=\"debugTS\">[" + ts + "]</span> " + 
-                       msg + "</li>" + c.innerHTML;
+       } else {
+               return true;
        }
 }
 
@@ -1460,7 +705,7 @@ function fatalError(code, msg, ext_info) {
                if (code == 6) {
                        window.location.href = "tt-rss.php";                    
                } else if (code == 5) {
-                       window.location.href = "update.php";
+                       window.location.href = "db-updater.php";
                } else {
        
                        if (msg == "") msg = "Unknown error";
@@ -1492,21 +737,6 @@ function fatalError(code, msg, ext_info) {
        }
 }
 
-function getFeedName(id, is_cat) {     
-       var e;
-
-       if (is_cat) {
-               e = $("FCATN-" + id);
-       } else {
-               e = $("FEEDN-" + id);
-       }
-       if (e) {
-               return e.innerHTML.stripTags();
-       } else {
-               return null;
-       }
-}
-
 function filterDlgCheckType(sender) {
 
        try {
@@ -1520,7 +750,7 @@ function filterDlgCheckType(sender) {
                }
 
                if (!form) {
-                       debug("filterDlgCheckType: can't find form!");
+                       console.log("filterDlgCheckType: can't find form!");
                        return;
                }
 
@@ -1553,14 +783,14 @@ function filterDlgCheckAction(sender) {
                }
 
                if (!form) {
-                       debug("filterDlgCheckAction: can't find form!");
+                       console.log("filterDlgCheckAction: can't find form!");
                        return;
                }
 
                var action_param = $("filter_dlg_param_box");
 
                if (!action_param) {
-                       debug("filterDlgCheckAction: can't find action param box!");
+                       console.log("filterDlgCheckAction: can't find action param box!");
                        return;
                }
 
@@ -1593,7 +823,7 @@ function filterDlgCheckDate() {
                }
 
                if (!form) {
-                       debug("filterDlgCheckAction: can't find form!");
+                       console.log("filterDlgCheckAction: can't find form!");
                        return;
                }
 
@@ -1638,145 +868,6 @@ function explainError(code) {
        return displayDlg("explainError", code);
 }
 
-// this only searches loaded headlines list, not in CDM
-function getRelativePostIds(id, limit) {
-
-       if (!limit) limit = 3;
-
-       debug("getRelativePostIds: " + id + " limit=" + limit);
-
-       var ids = new Array();
-       var container = $("headlinesList");
-
-       if (container) {
-               var rows = container.rows;
-
-               for (var i = 0; i < rows.length; i++) {
-                       var r_id = rows[i].id.replace("RROW-", "");
-
-                       if (r_id == id) {
-                               for (var k = 1; k <= limit; k++) {
-                                       var nid = false;
-
-                                       if (i > k-1) var nid = rows[i-k].id.replace("RROW-", "");
-                                       if (nid) ids.push(nid);
-
-                                       if (i < rows.length-k) nid = rows[i+k].id.replace("RROW-", "");
-                                       if (nid) ids.push(nid);
-                               }
-
-                               return ids;
-                       }
-               }
-       }
-
-       return false;
-}
-
-function openArticleInNewWindow(id) {
-       try {
-               debug("openArticleInNewWindow: " + id);
-
-               var query = "?op=rpc&subop=getArticleLink&id=" + id;
-               var wname = "ttrss_article_" + id;
-
-               debug(query + " " + wname);
-
-               var w = window.open("", wname);
-
-               if (!w) notify_error("Failed to open window for the article");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-
-                                       var link = transport.responseXML.getElementsByTagName("link")[0];
-                                       var id = transport.responseXML.getElementsByTagName("id")[0];
-               
-                                       debug("open_article received link: " + link);
-               
-                                       if (link && id) {
-               
-                                               var wname = "ttrss_article_" + id.firstChild.nodeValue;
-               
-                                               debug("link url: " + link.firstChild.nodeValue + ", wname " + wname);
-               
-                                               var w = window.open(link.firstChild.nodeValue, wname);
-               
-                                               if (!w) { notify_error("Failed to load article in new window"); }
-               
-                                               if (id) {
-                                                       id = id.firstChild.nodeValue;
-                                                       if (!$("headlinesList")) {
-                                                               window.setTimeout("toggleUnread(" + id + ", 0)", 100);
-                                                       }
-                                               }
-                                       } else {
-                                               notify_error("Can't open article: received invalid article link");
-                                       }
-                               } });
-
-       } catch (e) {
-               exception_error("openArticleInNewWindow", e);
-       }
-}
-
-/* http://textsnippets.com/posts/show/835 */
-
-Position.GetWindowSize = function(w) {
-        w = w ? w : window;
-        var width = w.innerWidth || (w.document.documentElement.clientWidth || w.document.body.clientWidth);
-        var height = w.innerHeight || (w.document.documentElement.clientHeight || w.document.body.clientHeight);
-        return [width, height]
-}
-
-/* http://textsnippets.com/posts/show/836 */
-
-Position.Center = function(element, parent) {
-        var w, h, pw, ph;
-        var d = Element.getDimensions(element);
-        w = d.width;
-        h = d.height;
-        Position.prepare();
-        if (!parent) {
-                var ws = Position.GetWindowSize();
-                pw = ws[0];
-                ph = ws[1];
-        } else {
-                pw = parent.offsetWidth;
-                ph = parent.offsetHeight;
-        }
-        element.style.top = (ph/2) - (h/2) -  Position.deltaY + "px";
-        element.style.left = (pw/2) - (w/2) -  Position.deltaX + "px";
-}
-
-
-function isCdmMode() {
-       return !$("headlinesList");
-}
-
-function getSelectedArticleIds2() {
-       var rows = new Array();
-       var cdm_mode = isCdmMode();
-
-       if (cdm_mode) {
-               rows = cdmGetSelectedArticles();
-       } else {        
-               rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-       }
-
-       var ids = new Array();
-
-       for (var i = 0; i < rows.length; i++) {
-               var chk = $("RCHK-" + rows[i]);
-               if (chk && chk.checked) {
-                       ids.push(rows[i]);
-               }
-       }
-
-       return ids;
-}
-
 function displayHelpInfobox(topic_id) {
 
        var url = "backend.php?op=help&tid=" + param_escape(topic_id);
@@ -1786,33 +877,15 @@ function displayHelpInfobox(topic_id) {
 
 }
 
-function focus_element(id) {
-       try {
-               var e = $(id);
-               if (e) e.focus();
-       } catch (e) {
-               exception_error("focus_element", e);
-       }
-       return false;
-}
-
 function loading_set_progress(p) {
        try {
-               if (p < last_progress_point || !Element.visible("overlay")) return;
-
-               debug("<b>loading_set_progress : " + p + " (" + last_progress_point + ")</b>");
-
-               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);
@@ -1820,31 +893,28 @@ function loading_set_progress(p) {
 }
 
 function remove_splash() {
+
        if (Element.visible("overlay")) {
-               debug("about to remove splash, OMG!");
+               console.log("about to remove splash, OMG!");
                Element.hide("overlay");
-               debug("removed splash!");
+               console.log("removed splash!");
        }
 }
 
 function getSelectedFeedsFromBrowser() {
 
-       var list = $("browseFeedList");
+       var list = $$("#browseFeedList li[id*=FBROW]");
 
        var selected = new Array();
-       
-       for (i = 0; i < list.childNodes.length; i++) {
-               var child = list.childNodes[i];
-               if (child.id && child.id.match("FBROW-")) {
-                       var id = child.id.replace("FBROW-", "");
-                       
-                       var cb = $("FBCHK-" + id);
 
-                       if (cb.checked) {
-                               selected.push(id);
-                       }
-               }
-       }
+       list.each(function(child) {     
+               var id = child.id.replace("FBROW-", "");
+               var cb = $("FBCHK-" + id);
+
+               if (cb.checked) {
+                       selected.push(id);
+               }       
+       });
 
        return selected;
 }
@@ -1924,7 +994,7 @@ function hotkey_prefix_timeout() {
                var ts = Math.round(date.getTime() / 1000);
 
                if (hotkey_prefix_pressed && ts - hotkey_prefix_pressed >= 5) {
-                       debug("hotkey_prefix seems to be stuck, aborting");
+                       console.log("hotkey_prefix seems to be stuck, aborting");
                        hotkey_prefix_pressed = false;
                        hotkey_prefix = false;
                        Element.hide('cmdline');
@@ -1945,23 +1015,6 @@ function hideAuxDlg() {
        }
 }
 
-function displayNewContentPrompt(id) {
-       try {
-
-               var msg = "<a href='#' onclick='viewfeed("+id+")'>" +
-                       __("New articles available in this feed (click to show)") + "</a>";
-
-               msg = msg.replace("%s", getFeedName(id));
-
-               $('auxDlg').innerHTML = msg;
-
-               Element.show('auxDlg');
-
-       } catch (e) {
-               exception_error("displayNewContentPrompt", e);
-       }
-}
-
 function feedBrowserSubscribe() {
        try {
 
@@ -2066,7 +1119,7 @@ function removeFeedIcon(id) {
                if (confirm(__("Remove stored feed icon?"))) {
                        var query = "backend.php?op=pref-feeds&subop=removeicon&feed_id=" + param_escape(id);
 
-                       debug(query);
+                       console.log(query);
 
                        notify_progress("Removing feed icon...", true);
 
@@ -2110,7 +1163,7 @@ function uploadFeedIcon() {
        }
 }
 
-function addLabel() {
+function addLabel(select, callback) {
 
        try {
 
@@ -2126,14 +1179,19 @@ function addLabel() {
                        var query = "?op=pref-labels&subop=add&caption=" + 
                                param_escape(caption);
 
+                       if (select)
+                               query += "&output=select";
+
                        notify_progress("Loading, please wait...", true);
 
-                       if (inPreferences()) active_tab = "labelConfig";
+                       if (inPreferences() && !select) active_tab = "labelConfig";
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       if (inPreferences()) {
+                                       if (callback) {
+                                               callback(transport);
+                                       } else if (inPreferences()) {
                                                infobox_submit_callback2(transport);
                                        } else {
                                                updateFeedList();
@@ -2185,4 +1243,307 @@ function unsubscribeFeed(feed_id, title) {
 }
 
 
+function backend_sanity_check_callback(transport) {
+
+       try {
+
+               if (sanity_check_done) {
+                       fatalError(11, "Sanity check request received twice. This can indicate "+
+                     "presence of Firebug or some other disrupting extension. "+
+                               "Please disable it and try again.");
+                       return;
+               }
+
+               if (!transport.responseXML) {
+                       if (!store) {
+                               fatalError(3, "Sanity check: Received reply is not XML", 
+                                       transport.responseText);
+                               return;
+                       }
+               }
+
+               var reply = transport.responseXML.getElementsByTagName("error")[0];
+
+               if (!reply) {
+                       fatalError(3, "Sanity check: invalid RPC reply", transport.responseText);
+                       return;
+               }
+
+               var error_code = reply.getAttribute("error-code");
+       
+               if (error_code && error_code != 0) {
+                       return fatalError(error_code, reply.getAttribute("error-msg"));
+               }
+
+               console.log("sanity check ok");
+
+               var params = transport.responseXML.getElementsByTagName("init-params")[0];
+
+               if (params) {
+                       console.log('reading init-params...');
+
+                       params = JSON.parse(params.firstChild.nodeValue);
+
+                       if (params) {
+                               for (k in params) {
+                                       var v = params[k];
+                                       console.log("IP: " + k + " => " + v);
+                               }
+                       }
+
+                       init_params = params;
+               }
+
+               sanity_check_done = true;
+
+               init_second_stage();
+
+       } catch (e) {
+               exception_error("backend_sanity_check_callback", e, transport); 
+       } 
+}
+
+function has_local_storage() {
+       return false;
+/*     try {
+               return 'localStorage' in window && window['localStorage'] != null;
+       } catch (e) {
+               return false;
+       } */
+}
+
+function catSelectOnChange(elem) {
+       try {
+               var value = elem[elem.selectedIndex].value;
+               var def = elem.getAttribute('default');
+
+               if (value == "ADD_CAT") {
+
+                       if (def)
+                               dropboxSelect(elem, def);
+                       else
+                               elem.selectedIndex = 0;
+
+                       quickAddCat(elem);
+               }
+
+       } catch (e) {
+               exception_error("catSelectOnChange", e);
+       }
+}
+
+function quickAddCat(elem) {
+       try {
+               var cat = prompt(__("Please enter category title:"));
+
+               if (cat) {
+
+                       var query = "?op=rpc&subop=quickAddCat&cat=" + param_escape(cat);
+
+                       notify_progress("Loading, please wait...", true);
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function (transport) {
+                                       var response = transport.responseXML;
+                                       var select = response.getElementsByTagName("select")[0];
+                                       var options = select.getElementsByTagName("option");
+
+                                       dropbox_replace_options(elem, options);
+
+                                       notify('');
+
+                       } });
+
+               }
+
+       } catch (e) {
+               exception_error("quickAddCat", e);
+       }
+}
+
+function genUrlChangeKey(feed, is_cat) {
+
+       try {
+               var ok = confirm(__("Generate new syndication address for this feed?"));
+       
+               if (ok) {
+       
+                       notify_progress("Trying to change address...", true);
+       
+                       var query = "?op=rpc&subop=regenFeedKey&id=" + param_escape(feed) + 
+                               "&is_cat=" + param_escape(is_cat);
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                               var new_link = transport.responseXML.getElementsByTagName("link")[0];
+       
+                                               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);
+
+                                                       e.href = e.href.replace(/\&amp;key=.*$/,
+                                                               "&amp;key=" + new_link);
+
+                                                       new Effect.Highlight(e);
+
+                                                       notify('');
+       
+                                               } else {
+                                                       notify_error("Could not change feed URL.");
+                                               }
+                               } });
+               }
+       } catch (e) {
+               exception_error("genUrlChangeKey", e);
+       }
+       return false;
+}
+
+function labelSelectOnChange(elem) {
+       try {
+               var value = elem[elem.selectedIndex].value;
+               var def = elem.getAttribute('default');
+
+               if (value == "ADD_LABEL") {
+
+                       if (def)
+                               dropboxSelect(elem, def);
+                       else
+                               elem.selectedIndex = 0;
+
+                       addLabel(elem, function(transport) {
+
+                                       try {
+
+                                               var response = transport.responseXML;
+                                               var select = response.getElementsByTagName("select")[0];
+                                               var options = select.getElementsByTagName("option");
+
+                                               dropbox_replace_options(elem, options);
+
+                                               notify('');
+                                       } catch (e) {
+                                               exception_error("addLabel", e);
+                                       }
+                       });
+               }
+
+       } catch (e) {
+               exception_error("labelSelectOnChange", e);
+       }
+}
+
+function dropbox_replace_options(elem, options) {
+
+       try {
+               while (elem.hasChildNodes())
+                       elem.removeChild(elem.firstChild);
+
+               var sel_idx = -1;
+
+               for (var i = 0; i < options.length; i++) {
+                       var text = options[i].firstChild.nodeValue;
+                       var value = options[i].getAttribute("value");
+
+                       if (value == undefined) value = text;
+
+                       var issel = options[i].getAttribute("selected") == "1";
+
+                       var option = new Option(text, value, issel);
+
+                       if (options[i].getAttribute("disabled"))
+                               option.setAttribute("disabled", true);
+
+                       elem.insert(option);
+
+                       if (issel) sel_idx = i;
+               }
+
+               // Chrome doesn't seem to just select stuff when you pass new Option(x, y, true)
+               if (sel_idx >= 0) elem.selectedIndex = sel_idx;
+
+       } catch (e) {
+               exception_error("dropbox_replace_options", e);
+       }
+}
+
+// mode = all, none, invert
+function selectTableRows(id, mode) {
+       try {
+               var rows = $(id).rows;
+
+               for (var i = 0; i < rows.length; i++) {
+                       var row = rows[i];
+                       var cb = false;
+
+                       if (row.id && row.className) {
+                               var bare_id = row.id.replace(/^[A-Z]*?-/, "");
+                               var inputs = rows[i].getElementsByTagName("input");
+
+                               for (var j = 0; j < inputs.length; j++) {
+                                       var input = inputs[j];
+
+                                       if (input.getAttribute("type") == "checkbox" && 
+                                                       input.id.match(bare_id)) {
+
+                                               cb = input;
+                                               break;
+                                       }
+                               }
+
+                               if (cb) {
+                                       var issel = row.hasClassName("Selected");
+
+                                       if (mode == "all" && !issel) {
+                                               row.addClassName("Selected");
+                                               cb.checked = true;
+                                       } else if (mode == "none" && issel) {
+                                               row.removeClassName("Selected");
+                                               cb.checked = false;
+                                       } else if (mode == "invert") {
+
+                                               if (issel) {
+                                                       row.removeClassName("Selected");
+                                                       cb.checked = false;
+                                               } else {
+                                                       row.addClassName("Selected");
+                                                       cb.checked = true;
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+       } catch (e) {
+               exception_error("selectTableRows", e);
+
+       }
+}
+
+function getSelectedTableRowIds(id) {
+       var rows = [];
+
+       try {
+               var elem_rows = $(id).rows;
+
+               for (i = 0; i < elem_rows.length; i++) {
+                       if (elem_rows[i].hasClassName("Selected")) {
+                               var bare_id = elem_rows[i].id.replace(/^[A-Z]*?-/, "");
+                               rows.push(bare_id);
+                       }
+               }
+
+       } catch (e) {
+               exception_error("getSelectedTableRowIds", e);
+       }
+
+       return rows;
+}