[DE] Fix Bug 43460 (ONLYOFFICE#261)

cryptpad · Nov 6, 2019 · 3308662 · 3308662
1 parent 4196914
commit 3308662
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js
@@ -81,6 +81,7 @@ define([
         },
 
         setMode: function(mode) {
+            this.mode = mode;
             if (!mode.canHistoryClose) {
                 this.panelHistory.$el.find('#history-header').hide();
                 this.panelHistory.$el.find('#history-list').css('padding-top', 0);
@@ -163,6 +164,8 @@ define([
         },
 
         onSetHistoryData: function(opts) {
+            if (!this.mode.canUseHistory) return;
+
             if (opts.data.error) {
                  var config = {
                     title: this.notcriticalErrorTitle,

diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
@@ -487,6 +487,8 @@ define([
             },
 
             onRefreshHistory: function(opts) {
+                if (!this.appOptions.canUseHistory) return;
+
                 this.loadMask && this.loadMask.hide();
                 if (opts.data.error || !opts.data.history) {
                     var historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions');