move several methods from dlg; fix displayed tags not updated after editing

[tt-rss.git] / js / viewfeed.js

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 2434a82118515b1f15f52da114905f13e9c5711b..c24dec62eb3d9ad8a22e81665037784022e78eb1 100644 (file)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -52,9 +52,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                        setActiveFeedId(feed_id, is_cat);
 
-                       dijit.getEnclosingWidget(
+                       /* dijit.getEnclosingWidget(
                                document.forms["main_toolbar_form"].update).attr('disabled',
-                                       is_cat || feed_id <= 0);
+                                       is_cat || feed_id <= 0); */
 
                        try {
                                if (infscroll_req == false) {
@@ -243,7 +243,6 @@ function render_article(article) {
 function showArticleInHeadlines(id) {
 
        try {
-
                selectArticles("none");
 
                var crow = $("RROW-" + id);
@@ -253,6 +252,7 @@ function showArticleInHeadlines(id) {
                var article_is_unread = crow.hasClassName("Unread");
 
                crow.removeClassName("Unread");
+               crow.addClassName("active");
 
                selectArticles('none');
 
@@ -337,6 +337,9 @@ function article_callback2(transport, id) {
 
 function view(id) {
        try {
+               var oldrow = $("RROW-" + getActiveArticleId());
+               if (oldrow) oldrow.removeClassName("active");
+
                var crow = $("RROW-" + id);
 
                if (!crow) return;
@@ -635,12 +638,6 @@ function toggleUnread(id, cmode, effect) {
                                if (row.hasClassName("Unread")) {
                                        row.removeClassName("Unread");
 
-                                       if (effect) {
-                                               new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
-                                                       afterFinish: toggleUnread_afh,
-                                                       queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
-                                       }
-
                                } else {
                                        row.addClassName("Unread");
                                }
@@ -649,12 +646,6 @@ function toggleUnread(id, cmode, effect) {
 
                                row.removeClassName("Unread");
 
-                               if (effect) {
-                                       new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
-                                               afterFinish: toggleUnread_afh,
-                                               queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
-                               }
-
                        } else if (cmode == 1) {
                                row.addClassName("Unread");
                        }
@@ -735,9 +726,9 @@ function selectionAssignLabel(id, ids) {
        }
 }
 
-function selectionToggleUnread(set_state, callback, no_error) {
+function selectionToggleUnread(set_state, callback, no_error, ids) {
        try {
-               var rows = getSelectedArticleIds2();
+               var rows = ids ? ids : getSelectedArticleIds2();
 
                if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
@@ -796,12 +787,13 @@ function selectionToggleUnread(set_state, callback, no_error) {
        }
 }
 
-function selectionToggleMarked() {
+// sel_state ignored
+function selectionToggleMarked(sel_state, callback, no_error, ids) {
        try {
 
-               var rows = getSelectedArticleIds2();
+               var rows = ids ? ids : getSelectedArticleIds2();
 
-               if (rows.length == 0) {
+               if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
                        return;
                }
@@ -819,6 +811,7 @@ function selectionToggleMarked() {
                                parameters: query,
                                onComplete: function(transport) {
                                        handle_rpc_json(transport);
+                                       if (callback) callback(transport);
                                } });
 
                }
@@ -828,12 +821,13 @@ function selectionToggleMarked() {
        }
 }
 
-function selectionTogglePublished() {
+// sel_state ignored
+function selectionTogglePublished(sel_state, callback, no_error, ids) {
        try {
 
-               var rows = getSelectedArticleIds2();
+               var rows = ids ? ids : getSelectedArticleIds2();
 
-               if (rows.length == 0) {
+               if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
                        return;
                }
@@ -947,23 +941,6 @@ function selectArticles(mode) {
        }
 }
 
-function catchupPage() {
-
-       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-
-       var str = __("Mark all visible articles in %s as read?");
-
-       str = str.replace("%s", fn);
-
-       if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-               return;
-       }
-
-       selectArticles('all');
-       selectionToggleUnread(false, 'viewCurrentFeed()', true);
-       selectArticles('none');
-}
-
 function deleteSelection() {
 
        try {
@@ -1027,6 +1004,9 @@ function archiveSelection() {
                        op = "archive";
                } else {
                        str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length);
+
+                       str += " " + __("Please note that unstarred articles might get purged on next feed update.");
+
                        op = "unarchive";
                }
 
@@ -1087,7 +1067,7 @@ function catchupSelection() {
 }
 
 function editArticleTags(id) {
-               var query = "backend.php?op=dlg&method=editArticleTags&param=" + param_escape(id);
+               var query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
 
                if (dijit.byId("editTagsDlg"))
                        dijit.byId("editTagsDlg").destroyRecursive();
@@ -1105,22 +1085,25 @@ function editArticleTags(id) {
                                        new Ajax.Request("backend.php", {
                                        parameters: query,
                                        onComplete: function(transport) {
-                                               notify('');
-                                               dialog.hide();
+                                               try {
+                                                       notify('');
+                                                       dialog.hide();
 
-                                               var data = JSON.parse(transport.responseText);
+                                                       var data = JSON.parse(transport.responseText);
 
-                                               if (data) {
-                                                       var tags_str = article.tags;
-                                                       var id = tags_str.id;
+                                                       if (data) {
+                                                               var id = data.id;
 
-                                                       var tags = $("ATSTR-" + id);
-                                                       var tooltip = dijit.byId("ATSTRTIP-" + id);
+                                                               console.log(id);
 
-                                                       if (tags) tags.innerHTML = tags_str.content;
-                                                       if (tooltip) tooltip.attr('label', tags_str.content_full);
+                                                               var tags = $("ATSTR-" + id);
+                                                               var tooltip = dijit.byId("ATSTRTIP-" + id);
 
-                                                       cache_delete("article:" + id);
+                                                               if (tags) tags.innerHTML = data.content;
+                                                               if (tooltip) tooltip.attr('label', data.content_full);
+                                                       }
+                                               } catch (e) {
+                                                       exception_error("editArticleTags/inner", e);
                                                }
 
                                        }});
@@ -1150,7 +1133,9 @@ function cdmScrollToArticleId(id, force) {
 
                if (force || e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) ||
                                e.offsetTop < ctr.scrollTop) {
-                       ctr.scrollTop = e.offsetTop;
+
+                       // expanded cdm has a 4px margin now
+                       ctr.scrollTop = parseInt(e.offsetTop) - 4;
                }
 
        } catch (e) {
@@ -1171,11 +1156,11 @@ function postMouseIn(e, id) {
 
        if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
 
-       if (!isCdmMode() || !getInitParam("cdm_expanded")) {
+       /* if (!isCdmMode() || !getInitParam("cdm_expanded")) {
                _post_preview_timeout = window.setTimeout(function() {
                        displaySmallArticlePreview(e, id);
                }, 1000);
-       }
+       } */
 }
 
 function displaySmallArticlePreview(e, id) {
@@ -1432,6 +1417,8 @@ function cdmExpandArticle(id) {
 
                if (!$("RROW-" + id)) return false;
 
+               var oldrow = $("RROW-" + getActiveArticleId());
+
                var elem = $("CICD-" + getActiveArticleId());
 
                if (id == getActiveArticleId() && Element.visible(elem))
@@ -1448,9 +1435,10 @@ function cdmExpandArticle(id) {
                        Element.hide(elem);
                        Element.show("CEXC-" + getActiveArticleId());
                        Element.hide(collapse);
-                       $("RROW-" + getActiveArticleId()).removeClassName("active");
                }
 
+               if (oldrow) oldrow.removeClassName("active");
+
                setActiveArticleId(id);
 
                elem = $("CICD-" + id);
@@ -1470,7 +1458,6 @@ function cdmExpandArticle(id) {
                        Element.show(elem);
                        Element.hide("CEXC-" + id);
                        Element.show(collapse);
-                       $("RROW-" + id).addClassName("active");
                }
 
                var new_offset = $("RROW-" + id).offsetTop;
@@ -1480,6 +1467,7 @@ function cdmExpandArticle(id) {
 
                toggleUnread(id, 0, true);
                toggleSelected(id);
+               $("RROW-" + id).addClassName("active");
 
        } catch (e) {
                exception_error("cdmExpandArticle", e);
@@ -1551,6 +1539,8 @@ function dismissArticle(id) {
        try {
                var elem = $("RROW-" + id);
 
+               if (!elem) return;
+
                toggleUnread(id, 0, true);
 
                new Effect.Fade(elem, {duration : 0.5});
@@ -1892,6 +1882,41 @@ function initHeadlinesMenu() {
 
                menu.addChild(new dijit.MenuSeparator());
 
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Toggle unread"),
+                       onClick: function(event) {
+                               var ids = getSelectedArticleIds2();
+                               // cast to string
+                               var id = this.getParent().callerRowId + "";
+                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+
+                               selectionToggleUnread(undefined, false, true, ids);
+                               }}));
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Toggle marked"),
+                       onClick: function(event) {
+                               var ids = getSelectedArticleIds2();
+                               // cast to string
+                               var id = this.getParent().callerRowId + "";
+                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+
+                               selectionToggleMarked(undefined, false, true, ids);
+                               }}));
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Toggle published"),
+                       onClick: function(event) {
+                               var ids = getSelectedArticleIds2();
+                               // cast to string
+                               var id = this.getParent().callerRowId + "";
+                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+
+                               selectionTogglePublished(undefined, false, true, ids);
+                               }}));
+
+               menu.addChild(new dijit.MenuSeparator());
+
                menu.addChild(new dijit.MenuItem({
                        label: __("Mark above as read"),
                        onClick: function(event) {