Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/word-formulas

Browse source
This commit is contained in:
SergeyLuzyanin 2018-11-29 11:35:36 +03:00
parent 64dcb2029b 9a2f624205
commit 65a85bed70
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/view/BookmarksDialog.js
View file

@ -271,12 +271,12 @@ define([
gotoBookmark: function(btn, eOpts){ gotoBookmark: function(btn, eOpts){
var rec = this.bookmarksList.getSelectedRec(); var rec = this.bookmarksList.getSelectedRec();
if (rec.length>0) { 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) { onDblClickBookmark: function(listView, itemView, record) {
this.props.asc_GoToBookmark(record.get('value')); this.props.asc_SelectBookmark(record.get('value'));
}, },
deleteBookmark: function(btn, eOpts){ deleteBookmark: function(btn, eOpts){

6
apps/documenteditor/main/app/view/FileMenu.js
View file

@ -277,8 +277,10 @@ define([
this.$el.find('#fm-btn-back').hide().prev().hide(); this.$el.find('#fm-btn-back').hide().prev().hide();
this.panels['opts'].setMode(this.mode); this.panels['opts'].setMode(this.mode);
this.panels['info'].setMode(this.mode).updateInfo(this.document); this.panels['info'].setMode(this.mode);
this.panels['rights'].setMode(this.mode).updateInfo(this.document); !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.canCreateNew ) {
if (this.mode.templates && this.mode.templates.length) { if (this.mode.templates && this.mode.templates.length) {

6
apps/presentationeditor/main/app/view/FileMenu.js
View file

@ -274,8 +274,10 @@ define([
this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide'](); this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide']();
this.panels['opts'].setMode(this.mode); this.panels['opts'].setMode(this.mode);
this.panels['info'].setMode(this.mode).updateInfo(this.document); this.panels['info'].setMode(this.mode);
this.panels['rights'].setMode(this.mode).updateInfo(this.document); !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.canCreateNew ) {
if (this.mode.templates && this.mode.templates.length) { if (this.mode.templates && this.mode.templates.length) {

6
apps/spreadsheeteditor/main/app/view/FileMenu.js
View file

@ -265,8 +265,10 @@ define([
this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide'](); this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide']();
this.panels['opts'].setMode(this.mode); this.panels['opts'].setMode(this.mode);
this.panels['info'].setMode(this.mode).updateInfo(this.document); this.panels['info'].setMode(this.mode);
this.panels['rights'].setMode(this.mode).updateInfo(this.document); !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.canCreateNew ) {
if (this.mode.templates && this.mode.templates.length) { if (this.mode.templates && this.mode.templates.length) {