diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/Feeds.js | 7 | ||||
| -rwxr-xr-x | js/Headlines.js | 11 | ||||
| -rw-r--r-- | js/PrefFilterTree.js | 2 | ||||
| -rw-r--r-- | js/PrefLabelTree.js | 2 | ||||
| -rwxr-xr-x | js/prefs.js | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/js/Feeds.js b/js/Feeds.js index fbcb56150..07bc37192 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -212,7 +212,7 @@ define(["dojo/_base/declare"], function (declare) { App.setLoadingProgress(50); - document.onkeydown = (event) => { App.hotkeyHandler(event) }; + document.onkeydown = (event) => { return App.hotkeyHandler(event) }; window.setInterval(() => { Headlines.catchupBatched() }, 10 * 1000); if (!this.getActive()) { @@ -303,11 +303,6 @@ define(["dojo/_base/declare"], function (declare) { // this is used to quickly switch between feeds, sets active but xhr is on a timeout const delayed = params.delayed || false; - if (feed != this.getActive() || this.activeIsCat() != is_cat) { - this._search_query = false; - Article.setActive(0); - } - if (offset != 0) { if (this.infscroll_in_progress) return; diff --git a/js/Headlines.js b/js/Headlines.js index 8895399b2..c16b070be 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -16,10 +16,12 @@ define(["dojo/_base/declare"], function (declare) { Article.openInNewWindow(id); } - Article.setActive(id); + if (Article.getActive() != id) { + Article.setActive(id); - if (!App.getInitParam("cdm_expanded")) - Article.cdmScrollToId(id); + if (!App.getInitParam("cdm_expanded")) + Article.cdmScrollToId(id); + } return in_body; @@ -231,6 +233,9 @@ define(["dojo/_base/declare"], function (declare) { if (reply) { + if (offset == 0) + Article.setActive(0); + is_cat = reply['headlines']['is_cat']; feed_id = reply['headlines']['id']; Feeds.last_search_query = reply['headlines']['search_query']; diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index 4f6979f99..be321fd21 100644 --- a/js/PrefFilterTree.js +++ b/js/PrefFilterTree.js @@ -183,7 +183,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio Filters.addFilterAction(li, action); }, removeFilter: function () { - const msg = __("Remove filter?"); + const msg = __("FRemove filter?"); if (confirm(msg)) { this.hide(); diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js index f808e987b..45c96af16 100644 --- a/js/PrefLabelTree.js +++ b/js/PrefLabelTree.js @@ -64,7 +64,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f const dialog = new dijit.Dialog({ id: "labelEditDlg", title: __("Label Editor"), - style: "width: 600px", + style: "width: 650px", setLabelColor: function (id, fg, bg) { let kind = ''; diff --git a/js/prefs.js b/js/prefs.js index c89c0494f..afbdee0c9 100755 --- a/js/prefs.js +++ b/js/prefs.js @@ -76,7 +76,7 @@ require(["dojo/_base/kernel", initSecondStage: function() { this.enableCsrfSupport(); - document.onkeydown = (event) => { App.hotkeyHandler(event) }; + document.onkeydown = (event) => { return App.hotkeyHandler(event) }; App.setLoadingProgress(50); Notify.close(); |