summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-06-02 21:00:53 +0300
committerAndrew Dolgov <[email protected]>2020-06-02 21:00:53 +0300
commit676cdf6ee468a0df3db4a2cf11bc103d9f8f1fee (patch)
tree80b1a0e40dd3ece946bd33c6fd9adc5879f1058b /js
parentac17ded854557e77840bf99ec48e736a2586f7e4 (diff)
move isCombinedMode to AppBase so we wouldn't crash in preferences
Diffstat (limited to 'js')
-rw-r--r--js/AppBase.js3
-rw-r--r--js/tt-rss.js3
2 files changed, 3 insertions, 3 deletions
diff --git a/js/AppBase.js b/js/AppBase.js
index 8f9d71653..b037a52a2 100644
--- a/js/AppBase.js
+++ b/js/AppBase.js
@@ -134,6 +134,9 @@ define(["dojo/_base/declare"], function (declare) {
}
},
+ isCombinedMode: function() {
+ return this.getInitParam("combined_display_mode");
+ },
getActionByHotkeySequence: function (sequence) {
const hotkeys_map = App.getInitParam("hotkeys");
diff --git a/js/tt-rss.js b/js/tt-rss.js
index d8818420c..7c325cedf 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -204,9 +204,6 @@ require(["dojo/_base/kernel",
return Feeds.reloadCurrent('');
},
- isCombinedMode: function() {
- return App.getInitParam("combined_display_mode");
- },
hotkeyHandler: function(event) {
if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;