diff options
-rwxr-xr-x | classes/feeds.php | 7 | ||||
-rw-r--r-- | js/CommonDialogs.js | 46 | ||||
-rw-r--r-- | js/tt-rss.js | 2 |
3 files changed, 38 insertions, 17 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 9fe528723..b003f7b53 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -583,7 +583,10 @@ class Feeds extends Handler_Protected { if (!$line['lang']) $line['lang'] = 'en'; // this is filled from RROW data-content - $tmp_content .= "<div class=\"content-inner\" lang=\"".$line['lang']."\">"; + $tmp_content .= "<div class=\"content-inner\" lang=\"".$line['lang']."\"> + <img src='images/indicator_white.gif'> + </div>"; + $tmp_content .= "<div class=\"intermediate\">"; if ($line["orig_feed_id"]) { @@ -611,8 +614,6 @@ class Feeds extends Handler_Protected { } } - $tmp_content .= "</div>"; //content-inner - $tmp_content .= "<div class=\"intermediate\">"; $always_display_enclosures = $line["always_display_enclosures"]; $tmp_content .= Article::format_article_enclosures($id, $always_display_enclosures, diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 81ad2ffce..69a975254 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -11,11 +11,12 @@ define(["dojo/_base/declare"], function (declare) { switch (rc) { case 0: Notify.info("Upload complete."); - if (App.isPrefs()) { + + if (App.isPrefs()) + dijit.byId("feedTree").reload(); + else Feeds.reload(); - } else { - setTimeout('Feeds.reload(false, false)', 50); - } + break; case 1: Notify.error("Upload failed: icon is too big."); @@ -33,11 +34,12 @@ define(["dojo/_base/declare"], function (declare) { xhrPost("backend.php", query, () => { Notify.info("Feed icon removed."); - if (App.isPrefs()) { + + if (App.isPrefs()) + dijit.byId("feedTree").reload(); + else Feeds.reload(); - } else { - setTimeout('Feeds.reload(false, false)', 50); - } + }); } @@ -108,7 +110,11 @@ define(["dojo/_base/declare"], function (declare) { dialog.hide(); Notify.info(__("Subscribed to %s").replace("%s", feed_url)); - Feeds.reload(); + if (App.isPrefs()) + dijit.byId("feedTree").reload(); + else + Feeds.reload(); + break; case 2: dialog.show_error(__("Specified URL seems to be invalid.")); @@ -190,7 +196,12 @@ define(["dojo/_base/declare"], function (declare) { xhrPost("backend.php", query, () => { Notify.close(); dialog.hide(); - Feeds.reload(); + + if (App.isPrefs()) + dijit.byId("feedTree").reload(); + else + Feeds.reload(); + }); } @@ -272,7 +283,11 @@ define(["dojo/_base/declare"], function (declare) { xhrPost("backend.php", query, () => { Notify.close(); - Feeds.reload(); + + if (App.isPrefs()) + dijit.byId("feedTree").reload(); + else + Feeds.reload(); }); } else { @@ -365,7 +380,7 @@ define(["dojo/_base/declare"], function (declare) { if (dijit.byId("feedEditDlg")) dijit.byId("feedEditDlg").hide(); if (App.isPrefs()) { - Feeds.reload(); + dijit.byId("feedTree").reload(); } else { if (feed_id == Feeds.getActive()) setTimeout(() => { @@ -405,7 +420,12 @@ define(["dojo/_base/declare"], function (declare) { xhrPost("backend.php", dialog.attr('value'), () => { dialog.hide(); Notify.close(); - Feeds.reload(); + + if (App.isPrefs()) + dijit.byId("feedTree").reload(); + else + Feeds.reload(); + }); } }, diff --git a/js/tt-rss.js b/js/tt-rss.js index fc87ae24d..461adc147 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -421,7 +421,7 @@ require(["dojo/_base/kernel", Filters.quickAddFilter(); }; this.hotkey_actions["collapse_sidebar"] = function () { - Feeds.reloadCurrent(); + Feeds.toggle(); }; this.hotkey_actions["toggle_embed_original"] = function () { if (typeof embedOriginalArticle != "undefined") { |