diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/FeedTree.js | 60 | ||||
| -rw-r--r-- | js/feedlist.js | 25 | ||||
| -rw-r--r-- | js/functions.js | 39 | ||||
| -rw-r--r-- | js/tt-rss.js | 452 | ||||
| -rw-r--r-- | js/viewfeed.js | 28 |
5 files changed, 331 insertions, 273 deletions
diff --git a/js/FeedTree.js b/js/FeedTree.js index 2e686c156..620efdbf6 100644 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -106,7 +106,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, { var id = args.item.id[0]; var bare_id = parseInt(id.substr(id.indexOf(':')+1)); - if (bare_id < -10) { + if (bare_id < _label_base_index) { var span = dojo.doc.createElement('span'); var fg_color = args.item.fg_color[0]; var bg_color = args.item.bg_color[0]; @@ -218,7 +218,63 @@ dojo.declare("fox.FeedTree", dijit.Tree, { return label; }, + expandParentNodes: function(feed, is_cat, list) { + try { + for (var i = 0; i < list.length; i++) { + var id = String(list[i].id); + var item = this._itemNodesMap[id]; + + if (item) { + item = item[0]; + this._expandNode(item); + } + } + } catch (e) { + exception_error("expandParentNodes", e); + } + }, + findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) { + // expands all parents of specified feed to properly mark it as active + // my fav thing about frameworks is doing everything myself + try { + var test_id = is_cat ? 'CAT:' + feed : 'FEED:' + feed; + + if (!root) { + if (!this.model || !this.model.store) return false; + + var items = this.model.store._arrayOfTopLevelItems; + + for (var i = 0; i < items.length; i++) { + if (String(items[i].id) == test_id) { + this.expandParentNodes(feed, is_cat, parents); + } else { + this.findNodeParentsAndExpandThem(feed, is_cat, items[i], []); + } + } + } else { + if (root.items) { + parents.push(root); + + for (var i = 0; i < root.items.length; i++) { + if (String(root.items[i].id) == test_id) { + this.expandParentNodes(feed, is_cat, parents); + } else { + this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents); + } + } + } else { + if (String(root.id) == test_id) { + this.expandParentNodes(feed, is_cat, parents); + } + } + } + } catch (e) { + exception_error("findNodeParentsAndExpandThem", e); + } + }, selectFeed: function(feed, is_cat) { + this.findNodeParentsAndExpandThem(feed, is_cat, false, false); + if (is_cat) treeNode = this._itemNodesMap['CAT:' + feed]; else @@ -324,7 +380,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, { var node = tree._itemNodesMap[id]; if (node) { - if (hide && unread == 0 && (bare_id > 0 || bare_id < -10 || !show_special)) { + if (hide && unread == 0 && (bare_id > 0 || bare_id < _label_base_index || !show_special)) { Effect.Fade(node[0].rowNode, {duration : 0.3, queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }}); } else { diff --git a/js/feedlist.js b/js/feedlist.js index aaf6c2aa6..ec3b09dab 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -88,8 +88,6 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) { _infscroll_request_sent = timestamp; } - - hideAuxDlg(); } Form.enable("main_toolbar_form"); @@ -206,23 +204,6 @@ function request_counters(force) { } } -function displayNewContentPrompt(id) { - try { - - var msg = "<a href='#' onclick='viewCurrentFeed()'>" + - __("New articles available in this feed (click to show)") + "</a>"; - - msg = msg.replace("%s", getFeedName(id)); - - $('auxDlg').innerHTML = msg; - - new Effect.Appear('auxDlg', {duration : 0.5}); - - } catch (e) { - exception_error("displayNewContentPrompt", e); - } -} - function parse_counters(elems, scheduled_call) { try { for (var l = 0; l < elems.length; l++) { @@ -245,10 +226,6 @@ function parse_counters(elems, scheduled_call) { continue; } - if (id == getActiveFeedId() && ctr > getFeedUnread(id) && scheduled_call) { - displayNewContentPrompt(id); - } - if (getFeedUnread(id, (kind == "cat")) != ctr || (kind == "cat")) { } @@ -513,3 +490,5 @@ function decrementFeedCounter(feed, is_cat) { exception_error("decrement_feed_counter", e); } } + + diff --git a/js/functions.js b/js/functions.js index a9367da60..7da9abfbd 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2,6 +2,7 @@ var notify_silent = false; var loading_progress = 0; var sanity_check_done = false; var init_params = {}; +var _label_base_index = -1024; Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( function (callOriginal, options) { @@ -193,30 +194,29 @@ function notify_real(msg, no_hide, n_type) { */ - if (typeof __ != 'undefined') { - msg = __(msg); - } + msg = __(msg); if (n_type == 1) { n.className = "notify"; } else if (n_type == 2) { - n.className = "notifyProgress"; + n.className = "notify progress"; msg = "<img src='images/indicator_white.gif'> " + msg; } else if (n_type == 3) { - n.className = "notifyError"; + n.className = "notify error"; msg = "<img src='images/sign_excl.svg'> " + msg; } else if (n_type == 4) { - n.className = "notifyInfo"; + n.className = "notify info"; msg = "<img src='images/sign_info.svg'> " + msg; } -// msg = "<img src='images/live_com_loading.gif'> " + msg; - if (no_hide) { - msg += " (<a href='#' onclick=\"notify('')\">X</a>)"; + msg += " <span>(<a href='#' onclick=\"notify('')\">" + + __("close") + "</a>)</span>"; } +// msg = "<img src='images/live_com_loading.gif'> " + msg; + nb.innerHTML = msg; if (!no_hide) { @@ -717,15 +717,6 @@ function hotkey_prefix_timeout() { } } -function hideAuxDlg() { - try { - Element.hide('auxDlg'); - } catch (e) { - exception_error("hideAuxDlg", e); - } -} - - function uploadIconHandler(rc) { try { switch (rc) { @@ -1338,6 +1329,8 @@ function backend_sanity_check_callback(transport) { for (k in params) { var v = params[k]; console.log("IP: " + k + " => " + v); + + if (k == "label_base_index") _label_base_index = parseInt(v); } } @@ -1986,3 +1979,13 @@ function htmlspecialchars_decode (string, quote_style) { return string; } + + +function label_to_feed_id(label) { + return _label_base_index - 1 - Math.abs(label); +} + +function feed_to_label_id(feed) { + return _label_base_index - 1 + Math.abs(feed); +} + diff --git a/js/tt-rss.js b/js/tt-rss.js index 54ac077f4..6fdb8ff55 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -1,6 +1,7 @@ var global_unread = -1; var hotkey_prefix = false; var hotkey_prefix_pressed = false; +var hotkey_actions = {}; var _widescreen_mode = false; var _rpc_seq = 0; var _active_feed_id = 0; @@ -205,6 +206,7 @@ function genericSanityCheck() { return true; } + function init() { try { //dojo.registerModulePath("fox", "../../js/"); @@ -253,6 +255,233 @@ function init() { backend_sanity_check_callback(transport); } }); + hotkey_actions["next_feed"] = function() { + var rv = dijit.byId("feedTree").getNextFeed( + getActiveFeedId(), activeFeedIsCat()); + + if (rv) viewfeed(rv[0], '', rv[1]); + }; + hotkey_actions["prev_feed"] = function() { + var rv = dijit.byId("feedTree").getPreviousFeed( + getActiveFeedId(), activeFeedIsCat()); + + if (rv) viewfeed(rv[0], '', rv[1]); + }; + hotkey_actions["next_article"] = function() { + moveToPost('next'); + }; + hotkey_actions["prev_article"] = function() { + moveToPost('prev'); + }; + hotkey_actions["next_article_noscroll"] = function() { + moveToPost('next', true); + }; + hotkey_actions["prev_article_noscroll"] = function() { + moveToPost('prev', true); + }; + hotkey_actions["collapse_article"] = function() { + var id = getActiveArticleId(); + var elem = $("CICD-"+id); + if(elem.visible()) { + cdmCollapseArticle(null, id); + } + else { + cdmExpandArticle(id); + } + }; + hotkey_actions["search_dialog"] = function() { + search(); + }; + hotkey_actions["toggle_mark"] = function() { + selectionToggleMarked(undefined, false, true); + }; + hotkey_actions["toggle_publ"] = function() { + selectionTogglePublished(undefined, false, true); + }; + hotkey_actions["toggle_unread"] = function() { + selectionToggleUnread(undefined, false, true); + }; + hotkey_actions["edit_tags"] = function() { + var id = getActiveArticleId(); + if (id) { + editArticleTags(id, getActiveFeedId(), isCdmMode()); + }; + } + hotkey_actions["dismiss_selected"] = function() { + dismissSelectedArticles(); + }; + hotkey_actions["open_in_new_window"] = function() { + if (getActiveArticleId()) { + openArticleInNewWindow(getActiveArticleId()); + return; + } + }; + hotkey_actions["catchup_below"] = function() { + catchupRelativeToArticle(1); + }; + hotkey_actions["catchup_above"] = function() { + catchupRelativeToArticle(0); + }; + hotkey_actions["article_scroll_down"] = function() { + var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame"); + + scrollArticle(40); + }; + hotkey_actions["article_scroll_up"] = function() { + var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame"); + + scrollArticle(-40); + }; + hotkey_actions["close_article"] = function() { + if (isCdmMode()) { + if (!getInitParam("cdm_expanded")) { + cdmCollapseArticle(false, getActiveArticleId()); + } else { + dismissArticle(getActiveArticleId()); + } + } else { + closeArticlePanel(); + } + }; + hotkey_actions["email_article"] = function() { + if (typeof emailArticle != "undefined") { + emailArticle(); + } else if (typeof mailtoArticle != "undefined") { + mailtoArticle(); + } else { + alert(__("Please enable mail plugin first.")); + } + }; + hotkey_actions["select_all"] = function() { + selectArticles('all'); + }; + hotkey_actions["select_unread"] = function() { + selectArticles('unread'); + }; + hotkey_actions["select_marked"] = function() { + selectArticles('marked'); + }; + hotkey_actions["select_published"] = function() { + selectArticles('published'); + }; + hotkey_actions["select_invert"] = function() { + selectArticles('invert'); + }; + hotkey_actions["select_none"] = function() { + selectArticles('none'); + }; + hotkey_actions["feed_refresh"] = function() { + if (getActiveFeedId() != undefined) { + viewfeed(getActiveFeedId(), '', activeFeedIsCat()); + return; + } + }; + hotkey_actions["feed_unhide_read"] = function() { + toggleDispRead(); + }; + hotkey_actions["feed_subscribe"] = function() { + quickAddFeed(); + }; + hotkey_actions["feed_debug_update"] = function() { + window.open("backend.php?op=feeds&method=view&feed=" + getActiveFeedId() + + "&view_mode=adaptive&order_by=default&update=&m=ForceUpdate&cat=" + + activeFeedIsCat() + "&DevForceUpdate=1&debug=1&xdebug=1&csrf_token=" + + getInitParam("csrf_token")); + }; + hotkey_actions["feed_edit"] = function() { + if (activeFeedIsCat()) + alert(__("You can't edit this kind of feed.")); + else + editFeed(getActiveFeedId()); + }; + hotkey_actions["feed_catchup"] = function() { + if (getActiveFeedId() != undefined) { + catchupCurrentFeed(); + return; + } + }; + hotkey_actions["feed_reverse"] = function() { + reverseHeadlineOrder(); + }; + hotkey_actions["catchup_all"] = function() { + catchupAllFeeds(); + }; + hotkey_actions["cat_toggle_collapse"] = function() { + if (activeFeedIsCat()) { + dijit.byId("feedTree").collapseCat(getActiveFeedId()); + return; + } + }; + hotkey_actions["goto_all"] = function() { + viewfeed(-4); + }; + hotkey_actions["goto_fresh"] = function() { + viewfeed(-3); + }; + hotkey_actions["goto_marked"] = function() { + viewfeed(-1); + }; + hotkey_actions["goto_published"] = function() { + viewfeed(-2); + }; + hotkey_actions["goto_tagcloud"] = function() { + displayDlg("printTagCloud"); + }; + hotkey_actions["goto_prefs"] = function() { + gotoPreferences(); + }; + hotkey_actions["select_article_cursor"] = function() { + var id = getArticleUnderPointer(); + if (id) { + var cb = dijit.byId("RCHK-" + id); + if (cb) { + cb.attr("checked", !cb.attr("checked")); + toggleSelectRowById(cb, "RROW-" + id); + return false; + } + } + }; + hotkey_actions["create_label"] = function() { + addLabel(); + }; + hotkey_actions["create_filter"] = function() { + quickAddFilter(); + }; + hotkey_actions["collapse_sidebar"] = function() { + collapse_feedlist(); + }; + hotkey_actions["toggle_embed_original"] = function() { + if (typeof embedOriginalArticle != "undefined") { + if (getActiveArticleId()) + embedOriginalArticle(getActiveArticleId()); + } else { + alert(__("Please enable embed_original plugin first.")); + } + }; + hotkey_actions["toggle_widescreen"] = function() { + if (!isCdmMode()) { + _widescreen_mode = !_widescreen_mode; + + switchPanelMode(_widescreen_mode); + } + }; + hotkey_actions["help_dialog"] = function() { + helpDialog("main"); + }; + hotkey_actions["toggle_combined_mode"] = function() { + notify_progress("Loading, please wait..."); + + var value = isCdmMode() ? "false" : "true"; + var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.location.reload(); + } }); + }; + + } catch (e) { exception_error("init", e); } @@ -603,228 +832,11 @@ function hotkey_handler(e) { } } - switch (hotkey_action) { - case "next_feed": - var rv = dijit.byId("feedTree").getNextFeed( - getActiveFeedId(), activeFeedIsCat()); - - if (rv) viewfeed(rv[0], '', rv[1]); - return false; - case "prev_feed": - var rv = dijit.byId("feedTree").getPreviousFeed( - getActiveFeedId(), activeFeedIsCat()); - - if (rv) viewfeed(rv[0], '', rv[1]); - return false; - case "next_article": - moveToPost('next'); - return false; - case "prev_article": - moveToPost('prev'); - return false; - case "next_article_noscroll": - moveToPost('next', true); - return false; - case "prev_article_noscroll": - moveToPost('prev', true); - return false; - case "search_dialog": - search(); - return ; - case "toggle_mark": - selectionToggleMarked(undefined, false, true); - return false; - case "toggle_publ": - selectionTogglePublished(undefined, false, true); - return false; - case "toggle_unread": - selectionToggleUnread(undefined, false, true); - return false; - case "edit_tags": - var id = getActiveArticleId(); - if (id) { - editArticleTags(id, getActiveFeedId(), isCdmMode()); - return; - } - return false; - case "dismiss_selected": - dismissSelectedArticles(); - return false; - case "dismiss_read": - return false; - case "open_in_new_window": - if (getActiveArticleId()) { - openArticleInNewWindow(getActiveArticleId()); - return; - } - return false; - case "catchup_below": - catchupRelativeToArticle(1); - return false; - case "catchup_above": - catchupRelativeToArticle(0); - return false; - case "article_scroll_down": - var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame"); - - scrollArticle(ctr.offsetHeight/3); - return false; - case "article_scroll_up": - var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame"); - - scrollArticle(-ctr.offsetHeight/3); - return false; - case "close_article": - if (isCdmMode()) { - if (!getInitParam("cdm_expanded")) { - cdmCollapseArticle(false, getActiveArticleId()); - } else { - dismissArticle(getActiveArticleId()); - } - } else { - closeArticlePanel(); - } - return false; - case "email_article": - if (typeof emailArticle != "undefined") { - emailArticle(); - } else if (typeof mailtoArticle != "undefined") { - mailtoArticle(); - } else { - alert(__("Please enable mail plugin first.")); - } - return false; - case "select_all": - selectArticles('all'); - return false; - case "select_unread": - selectArticles('unread'); - return false; - case "select_marked": - selectArticles('marked'); - return false; - case "select_published": - selectArticles('published'); - return false; - case "select_invert": - selectArticles('invert'); - return false; - case "select_none": - selectArticles('none'); - return false; - case "feed_refresh": - if (getActiveFeedId() != undefined) { - viewfeed(getActiveFeedId(), '', activeFeedIsCat()); - return; - } - return false; - case "feed_unhide_read": - toggleDispRead(); - return false; - case "feed_subscribe": - quickAddFeed(); - return false; - case "feed_debug_update": - window.open("backend.php?op=feeds&method=view&feed=" + getActiveFeedId() + - "&view_mode=adaptive&order_by=default&update=&m=ForceUpdate&cat=" + - activeFeedIsCat() + "&DevForceUpdate=1&debug=1&xdebug=1&csrf_token=" + - getInitParam("csrf_token")); - return false; - case "feed_edit": - if (activeFeedIsCat()) - alert(__("You can't edit this kind of feed.")); - else - editFeed(getActiveFeedId()); - return false; - case "feed_catchup": - if (getActiveFeedId() != undefined) { - catchupCurrentFeed(); - return; - } - return false; - case "feed_reverse": - reverseHeadlineOrder(); - return false; - case "catchup_all": - catchupAllFeeds(); - return false; - case "cat_toggle_collapse": - if (activeFeedIsCat()) { - dijit.byId("feedTree").collapseCat(getActiveFeedId()); - return; - } - return false; - case "goto_all": - viewfeed(-4); - return false; - case "goto_fresh": - viewfeed(-3); - return false; - case "goto_marked": - viewfeed(-1); - return false; - case "goto_published": - viewfeed(-2); - return false; - case "goto_tagcloud": - displayDlg("printTagCloud"); - return false; - case "goto_prefs": - gotoPreferences(); - return false; - case "select_article_cursor": - var id = getArticleUnderPointer(); - if (id) { - var cb = dijit.byId("RCHK-" + id); - if (cb) { - cb.attr("checked", !cb.attr("checked")); - toggleSelectRowById(cb, "RROW-" + id); - return false; - } - } - return false; - case "create_label": - addLabel(); - return false; - case "create_filter": - quickAddFilter(); - return false; - case "collapse_sidebar": - collapse_feedlist(); - return false; - case "toggle_embed_original": - if (typeof embedOriginalArticle != "undefined") { - if (getActiveArticleId()) - embedOriginalArticle(getActiveArticleId()); - } else { - alert(__("Please enable embed_original plugin first.")); - } - return false; - case "toggle_widescreen": - if (!isCdmMode()) { - _widescreen_mode = !_widescreen_mode; - - switchPanelMode(_widescreen_mode); - } - return false; - case "help_dialog": - helpDialog("main"); - return false; - case "toggle_combined_mode": - notify_progress("Loading, please wait..."); - - var value = isCdmMode() ? "false" : "true"; - var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value; - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - window.location.reload(); - } }); + var action = hotkey_actions[hotkey_action]; + if (action != null) { + action(); return false; - default: - console.log("unhandled action: " + hotkey_action + "; hotkey: " + hotkey); } } catch (e) { diff --git a/js/viewfeed.js b/js/viewfeed.js index 794e94952..1d04c4276 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -347,8 +347,6 @@ function view(id) { console.log("cache check result: " + (cached_article != false)); - hideAuxDlg(); - var query = "?op=article&method=view&id=" + param_escape(id); var neighbor_ids = getRelativePostIds(id); @@ -541,7 +539,7 @@ function moveToPost(mode, noscroll) { if (!noscroll && article && article.offsetTop + article.offsetHeight > ctr.scrollTop + ctr.offsetHeight) { - scrollArticle(ctr.offsetHeight/2); + scrollArticle(ctr.offsetHeight/4); } else if (next_id) { cdmExpandArticle(next_id); @@ -566,7 +564,7 @@ function moveToPost(mode, noscroll) { if (!getInitParam("cdm_expanded")) { if (!noscroll && article.offsetTop < ctr.scrollTop) { - scrollArticle(-ctr.offsetHeight/3); + scrollArticle(-ctr.offsetHeight/4); } else { cdmExpandArticle(prev_id); cdmScrollToArticleId(prev_id, true); @@ -578,7 +576,7 @@ function moveToPost(mode, noscroll) { } else if (!noscroll && prev_article && prev_article.offsetTop < ctr.scrollTop) { cdmExpandArticle(prev_id); - scrollArticle(-ctr.offsetHeight/3); + scrollArticle(-ctr.offsetHeight/4); } else if (prev_id) { cdmExpandArticle(prev_id); cdmScrollToArticleId(prev_id, noscroll); @@ -1433,8 +1431,6 @@ function cdmExpandArticle(id) { if (!$("RROW-" + id)) return false; - hideAuxDlg(); - var elem = $("CICD-" + getActiveArticleId()); if (id == getActiveArticleId() && Element.visible(elem)) @@ -1643,8 +1639,6 @@ function cdmClicked(event, id) { try { //var shift_key = event.shiftKey; - hideAuxDlg(); - if (!event.ctrlKey) { if (!getInitParam("cdm_expanded")) { @@ -1920,7 +1914,7 @@ function initHeadlinesMenu() { var bare_id = id.substr(id.indexOf(":")+1); var name = label.name[0]; - bare_id = -11-bare_id; + bare_id = feed_to_label_id(bare_id); labelAddMenu.addChild(new dijit.MenuItem({ label: name, @@ -2120,3 +2114,17 @@ function displayArticleUrl(id) { exception_error("changeScore", e); } } + +function openSelectedAttachment(elem) { + try { + var url = elem[elem.selectedIndex].value; + + if (url) { + window.open(url); + elem.selectedIndex = 0; + } + + } catch (e) { + exception_error("openSelectedAttachment", e); + } +} |