From 565c9d7aa7580e4201ee0b695060b4d82f200868 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 27 Nov 2018 13:12:56 +0300 Subject: [PATCH 1/2] [DE] Use SelectBookmark function --- apps/documenteditor/main/app/view/BookmarksDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index a364df349..bbb9c8b5a 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -271,12 +271,12 @@ define([ gotoBookmark: function(btn, eOpts){ var rec = this.bookmarksList.getSelectedRec(); if (rec.length>0) { - this.props.asc_GoToBookmark(rec[0].get('value')); + this.props.asc_SelectBookmark(rec[0].get('value')); } }, onDblClickBookmark: function(listView, itemView, record) { - this.props.asc_GoToBookmark(record.get('value')); + this.props.asc_SelectBookmark(record.get('value')); }, deleteBookmark: function(btn, eOpts){ From 9a2f624205bb41f3e4486c5979e760b02108cf8a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 28 Nov 2018 13:17:12 +0300 Subject: [PATCH 2/2] Fix loading when get error Asc.c_oAscError.ID.EditingError --- apps/documenteditor/main/app/view/FileMenu.js | 6 ++++-- apps/presentationeditor/main/app/view/FileMenu.js | 6 ++++-- apps/spreadsheeteditor/main/app/view/FileMenu.js | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index de4c32223..57facff80 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/apps/documenteditor/main/app/view/FileMenu.js @@ -277,8 +277,10 @@ define([ this.$el.find('#fm-btn-back').hide().prev().hide(); this.panels['opts'].setMode(this.mode); - this.panels['info'].setMode(this.mode).updateInfo(this.document); - this.panels['rights'].setMode(this.mode).updateInfo(this.document); + this.panels['info'].setMode(this.mode); + !this.mode.isDisconnected && this.panels['info'].updateInfo(this.document); + this.panels['rights'].setMode(this.mode); + !this.mode.isDisconnected && this.panels['rights'].updateInfo(this.document); if ( this.mode.canCreateNew ) { if (this.mode.templates && this.mode.templates.length) { diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index f084b85cb..048cf6b3b 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/apps/presentationeditor/main/app/view/FileMenu.js @@ -274,8 +274,10 @@ define([ this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide'](); this.panels['opts'].setMode(this.mode); - this.panels['info'].setMode(this.mode).updateInfo(this.document); - this.panels['rights'].setMode(this.mode).updateInfo(this.document); + this.panels['info'].setMode(this.mode); + !this.mode.isDisconnected && this.panels['info'].updateInfo(this.document); + this.panels['rights'].setMode(this.mode); + !this.mode.isDisconnected && this.panels['rights'].updateInfo(this.document); if ( this.mode.canCreateNew ) { if (this.mode.templates && this.mode.templates.length) { diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index 5e113aba6..4008bf2c6 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -265,8 +265,10 @@ define([ this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide'](); this.panels['opts'].setMode(this.mode); - this.panels['info'].setMode(this.mode).updateInfo(this.document); - this.panels['rights'].setMode(this.mode).updateInfo(this.document); + this.panels['info'].setMode(this.mode); + !this.mode.isDisconnected && this.panels['info'].updateInfo(this.document); + this.panels['rights'].setMode(this.mode); + !this.mode.isDisconnected && this.panels['rights'].updateInfo(this.document); if ( this.mode.canCreateNew ) { if (this.mode.templates && this.mode.templates.length) {