]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
remove modalbox; use dijit.Dialog; further dojo-related updates
[tt-rss.git] / tt-rss.js
index 4226fd8da4e28a3f4d927e72fda284759f89e374..b0e747a0cebc9e19ffe3ed3d84dff00a6846cb6a 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -8,10 +8,6 @@ var number_of_feeds = 0;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 var init_params = {};
-var ver_offset = 0;
-var hor_offset = 0;
-var feeds_sort_by_unread = false;
-var feedlist_sortable_enabled = false;
 var _force_scheduled_update = false;
 var last_scheduled_update = false;
 
@@ -103,8 +99,6 @@ function updateFeedList() {
        try {
                //console.log("updateFeedList");
        
-               if (offline_mode) return render_offline_feedlist();
-       
                var query_str = "backend.php?op=feeds";
        
                if (display_tags) {
@@ -151,20 +145,12 @@ function catchupAllFeeds() {
 
 function viewCurrentFeed(subop) {
 
-//     if (getActiveFeedId()) {
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), subop, activeFeedIsCat());
-       } else {
-//             viewfeed(-1, subop); // FIXME
        }
        return false; // block unneeded form submits
 }
 
-/*function viewfeed(feed, subop) {
-       var f = window.frames["feeds-frame"];
-       f.viewfeed(feed, subop);
-} */
-
 function timeout() {
        if (getInitParam("bw_limit") == "1") return;
 
@@ -203,11 +189,11 @@ function timeout() {
                        new Ajax.Request("backend.php", {
                                parameters: query_str,
                                onComplete: function(transport) { 
-                                               handle_rpc_reply(transport, true);
+                                               handle_rpc_reply(transport, !_force_scheduled_update);
+                                               _force_scheduled_update = false;
                                        } });
 
                        last_scheduled_update = ts;
-                       _force_scheduled_update = false;
                }
 
        } catch (e) {
@@ -217,18 +203,9 @@ function timeout() {
        setTimeout("timeout()", 3000);
 }
 
-function resetSearch() {
-       var searchbox = $("searchbox")
-
-       if (searchbox.value != "" && getActiveFeedId()) {       
-               searchbox.value = "";
-               viewfeed(getActiveFeedId(), "");
-       }
-}
-
 function search() {
        closeInfoBox(); 
-       viewCurrentFeed(0, "");
+       viewCurrentFeed();
 }
 
 function updateTitle() {
@@ -260,12 +237,15 @@ function genericSanityCheck() {
 }
 
 function init() {
-
        try {
+               Form.disable("main_toolbar_form");
 
-               init_gears();
+               dojo.require("dijit.layout.BorderContainer");
+               dojo.require("dijit.layout.ContentPane");
+               dojo.require("dijit.Dialog");
+               dojo.require("dijit.form.Button");
 
-               Form.disable("main_toolbar_form");
+               //return remove_splash();
 
                if (!genericSanityCheck()) 
                        return;
@@ -285,91 +265,12 @@ function init() {
        }
 }
 
-function resize_headlines(delta_x, delta_y) {
-
-       try {
-
-               console.log("resize_headlines: " + delta_x + ":" + delta_y);
-       
-               var h_frame = $("headlines-frame");
-               var c_frame = $("content-frame");
-               var f_frame = $("footer");
-               var feeds_frame = $("feeds-holder");
-               var resize_grab = $("resize-grabber");
-               var resize_handle = $("resize-handle");
-
-               if (!c_frame || !h_frame) return;
-       
-               if (feeds_frame && getInitParam("theme") == "old-skool") {
-                               feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
-               }
-       
-               if (getInitParam("theme_options").match("horiz_resize")) {
-       
-                       if (delta_x != undefined) {
-                               if (c_frame.offsetLeft - delta_x > feeds_frame.offsetWidth + feeds_frame.offsetLeft + 100 && c_frame.offsetWidth + delta_x > 100) {
-                                       hor_offset = hor_offset + delta_x;
-                               }
-                       }
-       
-                       console.log("resize_headlines: HOR-mode: " + hor_offset);
-       
-                       c_frame.style.width = (400 + hor_offset) + "px";
-                       h_frame.style.right = c_frame.offsetWidth - 1 + "px";
-       
-                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 60) + "px";
-                       resize_grab.style.left = (h_frame.offsetLeft + h_frame.offsetWidth - 
-                               4) + "px";
-                       resize_grab.style.display = "block";
-
-                       //resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
-                       resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
-       
-               } else {
-       
-                       if (delta_y != undefined) {
-                               if (c_frame.offsetHeight + delta_y > 100 && h_frame.offsetHeight - delta_y > 100) {
-                                       ver_offset = ver_offset + delta_y;
-                               }
-                       }
-       
-                       console.log("resize_headlines: VER-mode: " + ver_offset);
-       
-                       h_frame.style.height = (300 - ver_offset) + "px";
-       
-                       c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 0) + "px";
-                       h_frame.style.height = h_frame.offsetHeight + "px";
-
-                       // Workaround for Opera: force the content page to be re-rendered, 
-                       // so it is not truncated:
-                       var content_pane = $("content-insert");
-                       content_pane.innerHTML = content_pane.innerHTML;
-               }
-       
-               if (getInitParam("cookie_lifetime") != 0) {
-                       setCookie("ttrss_offset_ver", ver_offset, 
-                               getInitParam("cookie_lifetime"));
-                       setCookie("ttrss_offset_hor", hor_offset, 
-                               getInitParam("cookie_lifetime"));
-               } else {
-                       setCookie("ttrss_offset_ver", ver_offset);
-                       setCookie("ttrss_offset_hor", hor_offset);
-               }
-
-       } catch (e) {
-               exception_error("resize_headlines", e);
-       }
-
-}
-
 function init_second_stage() {
 
        try {
 
                delCookie("ttrss_test");
 
-               window.onresize=resize_headlines;
-
                var toolbar = document.forms["main_toolbar_form"];
 
                dropboxSelect(toolbar.view_mode, getInitParam("default_view_mode"));
@@ -383,22 +284,6 @@ function init_second_stage() {
 
                loading_set_progress(60);
 
-               ver_offset = parseInt(getCookie("ttrss_offset_ver"));
-               hor_offset = parseInt(getCookie("ttrss_offset_hor"));
-
-               console.log("got offsets from cookies: ver " + ver_offset + " hor " + hor_offset);
-
-               /* fuck IE */
-
-               if (isNaN(hor_offset)) hor_offset = 0;
-               if (isNaN(ver_offset)) ver_offset = 0;
-
-               console.log("offsets from cookies [x:y]: " + hor_offset + ":" + ver_offset);
-
-               resize_headlines();
-
-               enable_offline_reading();
-
                if (has_local_storage())
                        localStorage.clear();
 
@@ -492,9 +377,7 @@ function quickMenuGo(opid) {
                }
 
                if (opid == "qmcResetUI") {
-                       hor_offset = 0;
-                       ver_offset = 0;
-                       resize_headlines();
+                       alert("Function not implemented");
                }
 
                if (opid == "qmcToggleReorder") {
@@ -699,7 +582,7 @@ function collapse_feedlist() {
        try {
                //console.log("collapse_feedlist");
                
-               var theme = getInitParam("theme");
+/*             var theme = getInitParam("theme");
                if (theme != "" && 
                                !getInitParam("theme_options").match("collapse_feedlist")) return;
 
@@ -757,7 +640,10 @@ function collapse_feedlist() {
 
                        new Ajax.Request("backend.php", { parameters: query });
 
-               }
+               } */
+
+               query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=true";
+
        } catch (e) {
                exception_error("collapse_feedlist", e);
        }
@@ -765,12 +651,12 @@ function collapse_feedlist() {
 
 function viewModeChanged() {
        cache_flush();
-       return viewCurrentFeed(0, '')
+       return viewCurrentFeed('')
 }
 
 function viewLimitChanged() {
        cache_flush();
-       return viewCurrentFeed(0, '')
+       return viewCurrentFeed('')
 }
 
 /* function adjustArticleScore(id, score) {
@@ -831,7 +717,6 @@ function hotkey_handler(e) {
                var shift_key = false;
 
                var cmdline = $('cmdline');
-               var feedlist = $('feedList');
 
                try {
                        shift_key = e.shiftKey;
@@ -855,12 +740,13 @@ function hotkey_handler(e) {
                        closeInfoBox();
                } 
 
-               if (!hotkeys_enabled) {
+               if (dialogs.length > 0 || !hotkeys_enabled) {
                        console.log("hotkeys disabled");
                        return;
                }
 
                if (keycode == 16) return; // ignore lone shift
+               if (keycode == 17) return; // ignore lone ctrl
 
                if ((keycode == 70 || keycode == 67 || keycode == 71) 
                                && !hotkey_prefix) {
@@ -986,27 +872,18 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 83 && shift_key) { // S
-                               var id = getActiveArticleId();
-                               if (id) {                               
-                                       togglePub(id);
-                               }
+                               selectionTogglePublished(undefined, false, true);
                                return;
                        }
 
                        if (keycode == 83) { // s
-                               var id = getActiveArticleId();
-                               if (id) {                               
-                                       toggleMark(id);
-                               }
+                               selectionToggleMarked(undefined, false, true);
                                return;
                        }
 
 
                        if (keycode == 85) { // u
-                               var id = getActiveArticleId();
-                               if (id) {                               
-                                       toggleUnread(id);
-                               }
+                               selectionToggleUnread(undefined, false, true)
                                return;
                        }
 
@@ -1118,11 +995,6 @@ function hotkey_handler(e) {
                                return resort_feedlist();
                        }
 
-                       if (keycode == 72) { // h
-                               hideReadHeadlines();
-                               return;
-                       }
-
                        if (keycode == 88) { // x
                                reverseHeadlineOrder();
                                return;
@@ -1233,10 +1105,6 @@ function hotkey_handler(e) {
        }
 }
 
-function feedsSortByUnread() {
-       return feeds_sort_by_unread;
-}
-
 function inPreferences() {
        return false;
 }
@@ -1263,13 +1131,6 @@ function showFeedsWithErrors() {
 
 function handle_rpc_reply(transport, scheduled_call) {
        try {
-               if (offline_mode) return false;
-
-               if (!transport.responseText && db) {
-                       offlineConfirmModeChange();
-                       return false;
-               } 
-
                if (transport.responseXML) {
 
                        if (!transport_error_check(transport)) return false;
@@ -1291,6 +1152,7 @@ function handle_rpc_reply(transport, scheduled_call) {
                                message = message.firstChild.nodeValue;
 
                                if (message == "UPDATE_COUNTERS") {
+                                       console.log("need to refresh counters...");
                                        setInitParam("last_article_id", -1);
                                        _force_scheduled_update = true;
                                }
@@ -1322,3 +1184,39 @@ function handle_rpc_reply(transport, scheduled_call) {
        return true;
 }
 
+function scheduleFeedUpdate() {
+       try {
+
+               if (!getActiveFeedId()) {
+                       alert(__("Please select some feed first."));
+                       return;
+               }
+
+               var query = "?op=rpc&subop=scheduleFeedUpdate&id=" + 
+                       param_escape(getActiveFeedId()) +
+                       "&is_cat=" + param_escape(activeFeedIsCat());
+
+               console.log(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+
+                               if (transport.responseXML) {
+                                       var message = transport.responseXML.getElementsByTagName("message")[0];
+
+                                       if (message) {
+                                               notify_info(message.firstChild.nodeValue);
+                                               return;
+                                       }
+                               }
+
+                               notify_error("Error communicating with server.");
+
+                       } });
+
+
+       } catch (e) {
+               exception_error("scheduleFeedUpdate", e);
+       }
+}