]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
remove modalbox; use dijit.Dialog; further dojo-related updates
[tt-rss.git] / viewfeed.js
index 597ae53021bc6fa863b5df794827202d58e6420d..209e84ebbb9f571ac23380b1dc60a74cb62127f9 100644 (file)
@@ -97,6 +97,10 @@ function headlines_callback2(transport, feed_cur_page) {
                        var response = transport.responseXML;
 
                        var headlines = response.getElementsByTagName("headlines")[0];
+
+                       var headlines_content = headlines.getElementsByTagName("content")[0];
+                       var headlines_toolbar = headlines.getElementsByTagName("toolbar")[0];
+                       
                        var headlines_info = response.getElementsByTagName("headlines-info")[0];
 
                        if (headlines_info)
@@ -124,7 +128,10 @@ function headlines_callback2(transport, feed_cur_page) {
        
                        if (feed_cur_page == 0) {
                                if (headlines) {
-                                       f.innerHTML = headlines.firstChild.nodeValue;
+                                       $("headlinesInnerContainer").innerHTML = headlines_content.firstChild.nodeValue;
+                                       $("headlines-toolbar").innerHTML = headlines_toolbar.firstChild.nodeValue;
+
+                                       dijit.byId("main").resize();
 
                                        var cache_prefix = "";
 
@@ -360,10 +367,6 @@ function article_callback2(transport, id) {
 
 //                     showArticleInHeadlines(id);     
 
-                       if (db) {
-                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", [id]);
-                       }
-
                        var reply = transport.responseXML.firstChild.firstChild;
                
                } else {
@@ -392,8 +395,6 @@ function view(id) {
        try {
                console.log("loading article: " + id);
 
-               if (offline_mode) return view_offline(id);
-
                var cached_article = cache_find(id);
 
                console.log("cache check result: " + (cached_article != false));
@@ -518,22 +519,12 @@ function toggleMark(id, client_only) {
                        img.alt = __("Unstar article");
                        query = query + "&mark=1";
 
-                       if (db) {
-                               db.execute("UPDATE articles SET marked = 1 WHERE id = ?", [id]);
-                       }
-
                } else {
                        img.src = img.src.replace("mark_set", "mark_unset");
                        img.alt = __("Star article");
                        query = query + "&mark=0";
-
-                       if (db) {
-                               db.execute("UPDATE articles SET marked = 0 WHERE id = ?", [id]);
-                       }
                }
 
-               update_local_feedlist_counters();
-
                if (!client_only) {
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -714,11 +705,6 @@ function toggleUnread(id, cmode, effect) {
                                        row.addClassName("Unread");
                                }
 
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = not unread "+
-                                               "WHERE id = ?", [id]);
-                               }
-
                        } else if (cmode == 0) {
 
                                row.removeClassName("Unread");
@@ -729,23 +715,10 @@ function toggleUnread(id, cmode, effect) {
                                                queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
                                } 
 
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = 0 "+
-                                               "WHERE id = ?", [id]);
-                               }
-
                        } else if (cmode == 1) {
                                row.addClassName("Unread");
-
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = 1 "+
-                                               "WHERE id = ?", [id]);
-                               }
-
                        }
 
-                       update_local_feedlist_counters();
-
                        if (cmode == undefined) cmode = 2;
 
                        var query = "?op=rpc&subop=catchupSelected" +
@@ -860,36 +833,20 @@ function selectionToggleUnread(set_state, callback_func, no_error) {
                                        } else {
                                                row.addClassName("Unread");
                                        }
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
-                                                       [rows[i]]);
-                                       }
                                }
 
                                if (set_state == false) {
                                        row.removeClassName("Unread");
-
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
-                                                       [rows[i]]);
-                                       }
                                }
 
                                if (set_state == true) {
                                        row.addClassName("Unread");
-
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
-                                                       [rows[i]]);
-                                       }
                                }
                        }
                }
 
                if (rows.length > 0) {
 
-                       update_local_feedlist_counters();
-
                        var cmode = "";
 
                        if (set_state == undefined) {
@@ -932,8 +889,6 @@ function selectionToggleMarked() {
                        toggleMark(rows[i], true, true);
                }
 
-               update_local_feedlist_counters();
-
                if (rows.length > 0) {
 
                        var query = "?op=rpc&subop=markSelected&ids=" +
@@ -1376,28 +1331,21 @@ function cache_inject(id, article, param) {
                   var date = new Date();
              var ts = Math.round(date.getTime() / 1000);
 
-                       if (db) {
-
-                               db.execute("INSERT INTO cache (id, article, param, added) VALUES (?, ?, ?, ?)",
-                                       [id, article, param, ts]);                              
-                       } else {
+                       var cache_obj = {};
        
-                               var cache_obj = {};
-       
-                               cache_obj["id"] = id;
-                               cache_obj["data"] = article;
-                               cache_obj["param"] = param;
+                       cache_obj["id"] = id;
+                       cache_obj["data"] = article;
+                       cache_obj["param"] = param;
 
-                               if (param) id = id + ":" + param;
+                       if (param) id = id + ":" + param;
 
-                               cache_added["TS:" + id] = ts;
+                       cache_added["TS:" + id] = ts;
+
+                       if (has_local_storage()) 
+                               localStorage.setItem(id, JSON.stringify(cache_obj));
+                       else
+                               article_cache.push(cache_obj);
 
-                               if (has_local_storage()) 
-                                       localStorage.setItem(id, JSON.stringify(cache_obj));
-                               else
-                                       article_cache.push(cache_obj);
-                       }
-       
                } else {
                        //console.log("cache_article: hit: " + id + " [p=" + param + "]");
                }
@@ -1408,35 +1356,20 @@ function cache_inject(id, article, param) {
 
 function cache_find(id) {
 
-       if (db) {
-               var rs = db.execute("SELECT article FROM cache WHERE id = ?", [id]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                       var a = rs.field(0);                    
-               }
+       if (has_local_storage()) {
+               var cache_obj = localStorage.getItem(id);
 
-               rs.close();
+               if (cache_obj) {
+                       cache_obj = JSON.parse(cache_obj);
 
-               return a;
+                       if (cache_obj)
+                               return cache_obj['data'];
+               }
 
        } else {
-
-               if (has_local_storage()) {
-                       var cache_obj = localStorage.getItem(id);
-       
-                       if (cache_obj) {
-                               cache_obj = JSON.parse(cache_obj);
-
-                               if (cache_obj)
-                                       return cache_obj['data'];
-                       }
-
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id) {
-                                       return article_cache[i]["data"];
-                               }
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id) {
+                               return article_cache[i]["data"];
                        }
                }
        }
@@ -1445,69 +1378,38 @@ function cache_find(id) {
 
 function cache_find_param(id, param) {
 
-       if (db) {
-               var rs = db.execute("SELECT article FROM cache WHERE id = ? AND param = ?",
-                       [id, param]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                       a = rs.field(0);
-               }
-
-               rs.close();
+       if (has_local_storage()) {
 
-               return a;
+               if (param) id = id + ":" + param;
 
-       } else {
-
-               if (has_local_storage()) {
+               var cache_obj = localStorage.getItem(id);
 
-                       if (param) id = id + ":" + param;
+               if (cache_obj) {
+                       cache_obj = JSON.parse(cache_obj);
 
-                       var cache_obj = localStorage.getItem(id);
-
-                       if (cache_obj) {
-                               cache_obj = JSON.parse(cache_obj);
-
-                               if (cache_obj)
-                                       return cache_obj['data'];
-                       }
+                       if (cache_obj)
+                               return cache_obj['data'];
+               }
 
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
-                                       return article_cache[i]["data"];
-                               }
+       } else {
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                               return article_cache[i]["data"];
                        }
                }
        }
+
        return false;
 }
 
 function cache_check(id) {
-
-       if (db) {
-               var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ?",
-                       [id]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                        a = rs.field(0) != "0";
-               }
-
-               rs.close();
-
-               return a;
-
+       if (has_local_storage()) {
+               if (localStorage.getItem(id))
+                       return true;
        } else {
-               if (has_local_storage()) {
-                       if (localStorage.getItem(id))
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id) {
                                return true;
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id) {
-                                       return true;
-                               }
                        }
                }
        }
@@ -1515,34 +1417,17 @@ function cache_check(id) {
 }
 
 function cache_check_param(id, param) {
+       if (has_local_storage()) {
 
-       if (db) {
-               var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ? AND param = ?",
-                       [id, param]);
-               var a = false;
+               if (param) id = id + ":" + param;
 
-               if (rs.isValidRow()) {
-                       a = rs.field(0) != "0";
-               }
-
-               rs.close();
-
-               return a;
+               if (localStorage.getItem(id))
+                       return true;
 
        } else {
-
-               if (has_local_storage()) {
-
-                       if (param) id = id + ":" + param;
-
-                       if (localStorage.getItem(id))
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
                                return true;
-
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
-                                       return true;
-                               }
                        }
                }
        }
@@ -1550,42 +1435,29 @@ function cache_check_param(id, param) {
 }
 
 function cache_expire() {
-       if (db) {
-               var date = new Date();
-               var ts = Math.round(date.getTime() / 1000);
-
-               db.execute("DELETE FROM cache WHERE added < ? - 1800 AND id LIKE 'FEEDLIST'", [ts]);
-               db.execute("DELETE FROM cache WHERE added < ? - 600 AND (id LIKE 'F:%' OR id LIKE 'C:%')", [ts]);
-               db.execute("DELETE FROM cache WHERE added < ? - 86400", [ts]);
-
-
-       } else {
-               if (has_local_storage()) {
+if (has_local_storage()) {
 
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
 
-                       for (var i = 0; i < localStorage.length; i++) {
+               for (var i = 0; i < localStorage.length; i++) {
 
-                               var id = localStorage.key(i);
+                       var id = localStorage.key(i);
 
-                               if (timestamp - cache_added["TS:" + id] > 180) {
-                                       localStorage.removeItem(id);
-                               }
+                       if (timestamp - cache_added["TS:" + id] > 180) {
+                               localStorage.removeItem(id);
                        }
+               }
 
-               } else {
-                       while (article_cache.length > 25) {
-                               article_cache.shift();
-                       }
+       } else {
+               while (article_cache.length > 25) {
+                       article_cache.shift();
                }
        }
 }
 
 function cache_flush() {
-       if (db) {
-               db.execute("DELETE FROM cache");
-       } else if (has_local_storage()) {
+       if (has_local_storage()) {
                localStorage.clear();
        } else {
                article_cache = new Array();
@@ -1594,41 +1466,34 @@ function cache_flush() {
 
 function cache_invalidate(id) {
        try {   
+               if (has_local_storage()) {
 
-               if (db) {
-                       rs = db.execute("DELETE FROM cache WHERE id = ?", [id]);
-                       return rs.rowsAffected != 0;
-               } else {
-
-                       if (has_local_storage()) {
-
-                               var found = false;
+                       var found = false;
 
-                               for (var i = 0; i < localStorage.length; i++) {
-                                       var key = localStorage.key(i);
+                       for (var i = 0; i < localStorage.length; i++) {
+                               var key = localStorage.key(i);
 
 //                                     console.warn("cache_invalidate: " + key_id + " cmp " + id);
 
-                                       if (key == id || key.indexOf(id + ":") == 0) {
-                                               localStorage.removeItem(key);
-                                               found = true;
-                                               break;
-                                       }
+                               if (key == id || key.indexOf(id + ":") == 0) {
+                                       localStorage.removeItem(key);
+                                       found = true;
+                                       break;
                                }
+                       }
 
-                               return found;
+                       return found;
 
-                       } else {
-                               var i = 0
+               } else {
+                       var i = 0
 
-                               while (i < article_cache.length) {
-                                       if (article_cache[i]["id"] == id) {
-                                               //console.log("cache_invalidate: removed id " + id);
-                                               article_cache.splice(i, 1);
-                                               return true;
-                                       }
-                                       i++;
+                       while (i < article_cache.length) {
+                               if (article_cache[i]["id"] == id) {
+                                       //console.log("cache_invalidate: removed id " + id);
+                                       article_cache.splice(i, 1);
+                                       return true;
                                }
+                               i++;
                        }
                }