From 676cdf6ee468a0df3db4a2cf11bc103d9f8f1fee Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 2 Jun 2020 21:00:53 +0300 Subject: [PATCH] move isCombinedMode to AppBase so we wouldn't crash in preferences --- js/AppBase.js | 3 +++ js/tt-rss.js | 3 --- 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;