]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
rework loading progressbar
[tt-rss.git] / tt-rss.js
index cfd992b6da2edb1b3ab6538092a01f8a65183d46..674623112913131b5eca0056759ab22255955c9e 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1,5 +1,4 @@
 var total_unread = 0;
-var display_tags = false;
 var global_unread = -1;
 var firsttime_update = true;
 var _active_feed_id = 0;
@@ -10,7 +9,6 @@ var hotkey_prefix_pressed = false;
 var init_params = {};
 var _force_scheduled_update = false;
 var last_scheduled_update = false;
-var treeModel;
 
 var _rpc_seq = 0;
 
@@ -52,42 +50,6 @@ function setActiveFeedId(id, is_cat) {
 }
 
 
-function isFeedlistSortable() {
-       return feedlist_sortable_enabled;
-}
-
-function tagsAreDisplayed() {
-       return display_tags;
-}
-
-function toggleTags(show_all) {
-
-       try {
-
-       console.log("toggleTags: " + show_all + "; " + display_tags);
-
-       var p = $("dispSwitchPrompt");
-
-       if (!show_all && !display_tags) {
-               displayDlg("printTagCloud");
-       } else if (show_all) {
-               closeInfoBox();
-               display_tags = true;
-               p.innerHTML = __("display feeds");
-               notify_progress("Loading, please wait...", true);
-               updateFeedList();
-       } else if (display_tags) {
-               display_tags = false;
-               p.innerHTML = __("tag cloud");
-               notify_progress("Loading, please wait...", true);
-               updateFeedList();
-       }
-
-       } catch (e) {
-               exception_error("toggleTags", e);
-       }
-}
-
 function dlg_frefresh_callback(transport, deleted_feed) {
        if (getActiveFeedId() == deleted_feed) {
                setTimeout("viewfeed(-5)", 100);
@@ -99,23 +61,69 @@ function dlg_frefresh_callback(transport, deleted_feed) {
 
 function updateFeedList() {
        try {
-               console.warn("updateFeedList: function not implemented");
-       
-/*             var query_str = "backend.php?op=feeds";
-       
-               if (display_tags) {
-                       query_str = query_str + "&tags=1";
-               }
-       
-               if (getActiveFeedId() && !activeFeedIsCat()) {
-                       query_str = query_str + "&actid=" + getActiveFeedId();
+
+//             $("feeds-holder").innerHTML = "<div id=\"feedlistLoading\">" + 
+//                     __("Loading, please wait...") + "</div>";
+
+               Element.show("feedlistLoading");
+
+               if (dijit.byId("feedTree")) {
+                       dijit.byId("feedTree").destroyRecursive();
                }
-               
-               new Ajax.Request("backend.php", {
-                       parameters: query_str,
-                       onComplete: function(transport) { 
-                               render_feedlist(transport.responseText);
-                       } }); */
+
+               var store = new dojo.data.ItemFileWriteStore({
+         url: "backend.php?op=feeds"});
+
+               var treeModel = new fox.FeedStoreModel({
+                       store: store,
+                       query: {
+                               "type": "feed"
+                       },
+                       rootId: "root",
+                       rootLabel: "Feeds",
+                       childrenAttrs: ["items"]
+               });
+
+               var tree = new fox.FeedTree({
+               model: treeModel,
+               onOpen: function (item, node) {
+                       var id = String(item.id);
+                       var cat_id = id.substr(id.indexOf(":")+1);
+
+                       new Ajax.Request("backend.php", 
+                               { parameters: "backend.php?op=feeds&subop=collapse&cid=" + 
+                                       param_escape(cat_id) + "&mode=1" } );
+          },
+               onClose: function (item, node) {
+                       var id = String(item.id);
+                       var cat_id = id.substr(id.indexOf(":")+1);
+
+                       new Ajax.Request("backend.php", 
+                               { parameters: "backend.php?op=feeds&subop=collapse&cid=" + 
+                                       param_escape(cat_id) + "&mode=0" } );
+
+          },
+               onClick: function (item, node) {
+                       var id = String(item.id);
+                       var is_cat = id.match("^CAT:");
+                       var feed = id.substr(id.indexOf(":")+1);
+                       viewfeed(feed, '', is_cat);
+                       return false;
+               },
+               openOnClick: false,
+               showRoot: false,
+               id: "feedTree",
+               }, "feedTree");
+
+               $("feeds-holder").appendChild(tree.domNode);
+
+               var tmph = dojo.connect(tree, 'onLoad', function() {
+               dojo.disconnect(tmph);
+                       Element.hide("feedlistLoading");
+                       loading_set_progress(25);
+               });
+
+               tree.startup();
 
        } catch (e) {
                exception_error("updateFeedList", e);
@@ -174,11 +182,7 @@ function timeout() {
                                firsttime_update = false;
                                omode = "T";
                        } else {
-                               if (display_tags) {
-                                       omode = "tl";
-                               } else {
-                                       omode = "flc";
-                               }
+                               omode = "flc";
                        }
                        
                        query_str = query_str + "&omode=" + omode;
@@ -243,75 +247,32 @@ function init() {
                Form.disable("main_toolbar_form");
 
                dojo.require("dijit.layout.BorderContainer");
+               dojo.require("dijit.layout.TabContainer");
                dojo.require("dijit.layout.ContentPane");
                dojo.require("dijit.Dialog");
                dojo.require("dijit.form.Button");
                dojo.require("dojo.data.ItemFileWriteStore");
                dojo.require("dijit.Tree");
                dojo.require("dijit.form.Select");
+               dojo.require("dijit.Toolbar");
+               dojo.require("dijit.ProgressBar");
                dojo.require("dojo.parser");
 
+               dojo.registerModulePath("fox", "../..");
+
+               dojo.require("fox.FeedTree");
+
+               if (typeof themeBeforeLayout == 'function') {
+                       themeBeforeLayout();
+               }
+
                dojo.addOnLoad(function() {
+                       updateFeedList();
+                       closeArticlePanel();
 
-                       var store = new dojo.data.ItemFileWriteStore({
-          url: "backend.php?op=feeds"});
-
-                       treeModel = new dijit.tree.ForestStoreModel({
-                               store: store,
-                               query: {
-                                       "type": "feed"
-                               },
-                               rootId: "root",
-                               rootLabel: "Feeds",
-                               childrenAttrs: ["items"]
-                       });
-
-                       var tree = new dijit.Tree({
-                               model: treeModel,
-                               _createTreeNode: function(args) {
-                                       var tnode = new dijit._TreeNode(args);
-                                       tnode.labelNode.innerHTML = args.label;
-                                       return tnode;
-                                       },
-                               getLabelClass: function (item, opened) {
-                                       return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
-                               },
-                               getRowClass: function (item, opened) {
-                                       return (!item.error || item.error == '') ? "dijitTreeRow" : 
-                                               "dijitTreeRow Error";
-                               },
-                               getLabel: function(item) {
-                                       if (item.unread > 0) {
-                                               return item.name + " (" + item.unread + ")";
-                                       } else {
-                                               return item.name;
-                                       }
-                               },
-                               onOpen: function (item, node) {
-                                       var id = String(item.id);
-                                       var cat_id = id.substr(id.indexOf(":")+1);
-
-                                       new Ajax.Request("backend.php", 
-                                               { parameters: "backend.php?op=feeds&subop=collapse&cid=" + 
-                                                       param_escape(cat_id) + "&mode=1" } );
-                          },
-                               onClose: function (item, node) {
-                                       var id = String(item.id);
-                                       var cat_id = id.substr(id.indexOf(":")+1);
-
-                                       new Ajax.Request("backend.php", 
-                                               { parameters: "backend.php?op=feeds&subop=collapse&cid=" + 
-                                                       param_escape(cat_id) + "&mode=0" } );
-
-                          },
-                               onClick: function (item, node) {
-                                       var id = String(item.id);
-                                       var is_cat = id.match("^CAT:");
-                                       var feed = id.substr(id.indexOf(":")+1);
-                                       viewfeed(feed, '', is_cat);                             
-                               },
-                               showRoot: false,
-                       }, "feedTree");
+                       if (typeof themeAfterLayout == 'function') {
+                               themeAfterLayout();
+                       }
 
                });
 
@@ -320,7 +281,7 @@ function init() {
 
                var params = "&ua=" + param_escape(navigator.userAgent);
 
-               loading_set_progress(30);
+               loading_set_progress(20);
 
                new Ajax.Request("backend.php", {
                        parameters: "backend.php?op=rpc&subop=sanityCheck" + params,
@@ -346,14 +307,15 @@ function init_second_stage() {
 
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
-               loading_set_progress(60);
+               loading_set_progress(30);
 
                if (has_local_storage())
                        localStorage.clear();
 
-               console.log("second stage ok");
-
                feedlist_init();
+               setTimeout("timeout()", 3000);
+
+               console.log("second stage ok");
 
        } catch (e) {
                exception_error("init_second_stage", e);
@@ -375,6 +337,10 @@ function quickMenuGo(opid) {
                        gotoPreferences();
                }
        
+               if (opid == "qmcTagCloud") {
+                       displayDlg("printTagCloud");
+               }
+
                if (opid == "qmcSearch") {
                        displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
                                function() { 
@@ -444,38 +410,6 @@ function quickMenuGo(opid) {
                        Effect.Appear("hotkey_help_overlay", {duration : 0.3});
                }
 
-               if (opid == "qmcResetUI") {
-                       alert("Function not implemented");
-               }
-
-               if (opid == "qmcToggleReorder") {
-                       feedlist_sortable_enabled = !feedlist_sortable_enabled;
-
-                       if (feedlist_sortable_enabled) {
-                               notify_info("Category reordering enabled");
-                               toggle_sortable_feedlist(true);
-                       } else {
-                               notify_info("Category reordering disabled");
-                               toggle_sortable_feedlist(false);
-                       }
-               }
-
-               if (opid == "qmcResetCats") {
-
-                       if (confirm(__("Reset category order?"))) {
-
-                               var query = "?op=feeds&subop=catsortreset";
-
-                               notify_progress("Loading, please wait...", true);
-
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) { 
-                                               window.setTimeout('updateFeedList(false, false)', 50);
-                                       } });
-                       }
-               }
-
        } catch (e) {
                exception_error("quickMenuGo", e);
        }
@@ -491,10 +425,11 @@ function toggleDispRead() {
                var query = "?op=rpc&subop=setpref&key=HIDE_READ_FEEDS&value=" + 
                        param_escape(hide);
 
+               setInitParam("hide_read_feeds", hide);
+
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) { 
-                               setInitParam("hide_read_feeds", hide);
                        } });
                                
        } catch (e) {
@@ -583,7 +518,7 @@ function editFeedDlg(feed) {
                        return;
                }
        
-               if ((feed <= 0) || activeFeedIsCat() || tagsAreDisplayed()) {
+               if ((feed <= 0) || activeFeedIsCat()) {
                        alert(__("You can't edit this kind of feed."));
                        return;
                }
@@ -701,7 +636,7 @@ function rescoreCurrentFeed() {
 
        var actid = getActiveFeedId();
 
-       if (activeFeedIsCat() || actid < 0 || tagsAreDisplayed()) {
+       if (activeFeedIsCat() || actid < 0) {
                alert(__("You can't rescore this kind of feed."));
                return;
        }       
@@ -758,7 +693,13 @@ function hotkey_handler(e) {
                        closeInfoBox();
                } 
 
-               if (dialogs.length > 0 || !hotkeys_enabled) {
+               var dialog = dijit.byId("infoBox");
+               var dialog_visible = false;
+
+               if (dialog)
+                       dialog_visible = Element.visible(dialog.domNode);
+
+               if (dialog_visible || !hotkeys_enabled) {
                        console.log("hotkeys disabled");
                        return;
                }
@@ -794,7 +735,6 @@ function hotkey_handler(e) {
 
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
-                                       //Element.show("hotkey_help_overlay");
                                        Effect.Appear("hotkey_help_overlay", {duration : 0.3});
                                } else {
                                        Element.hide("hotkey_help_overlay");
@@ -810,40 +750,13 @@ function hotkey_handler(e) {
                                return false;
                        }
 
-/*                     if (keycode == 82 && shift_key) { // R
-                               scheduleFeedUpdate(true);
-                               return;
-                       } */
-
                        if (keycode == 74) { // j
-                               var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'prev');
-//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
-                               if (new_feed) {
-                                       var is_cat = new_feed.match("CAT:");
-                                       if (is_cat) {
-                                               new_feed = new_feed.replace("CAT:", "");
-                                               viewCategory(new_feed);
-                                       } else {
-                                               viewfeed(new_feed, '', false);
-                                       }
-                               }
+                               // TODO: move to previous feed
                                return;
                        }
        
                        if (keycode == 75) { // k
-                               var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'next');
-//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
-                               if (new_feed) {
-                                       var is_cat = new_feed.match("CAT:");
-                                       if (is_cat == "CAT:") {
-                                               new_feed = new_feed.replace("CAT:", "");
-                                               viewCategory(new_feed);
-                                       } else {
-                                               viewfeed(new_feed, '', false);
-                                       }
-                               }
+                               // TODO: move to next feed
                                return;
                        }
 
@@ -972,11 +885,6 @@ function hotkey_handler(e) {
                                return false;
                        }
 
-/*                     if (keycode == 85 && shift_key) { // U
-                               scheduleFeedUpdate(true);
-                               return false;
-                       } */
-
                        if (keycode == 85) { // u
                                if (getActiveFeedId()) {
                                        viewfeed(getActiveFeedId(), "ForceUpdate");
@@ -1043,14 +951,8 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 77) { // m
-                               feedlist_sortable_enabled = !feedlist_sortable_enabled;
-                               if (feedlist_sortable_enabled) {
-                                       notify_info("Category reordering enabled");
-                                       toggle_sortable_feedlist(true);
-                               } else {
-                                       notify_info("Category reordering disabled");
-                                       toggle_sortable_feedlist(false);
-                               }
+                               // TODO: sortable feedlist
+                               return;
                        }
 
                        if (keycode == 78) { // n
@@ -1186,9 +1088,6 @@ function handle_rpc_reply(transport, scheduled_call) {
                        if (runtime_info)
                                parse_runtime_info(runtime_info);
 
-                       if (feedsSortByUnread())
-                               resort_feedlist();
-
                        hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
                } else {