Merge remote-tracking branch 'remotes/origin/develop' into feature/word-formulas
This commit is contained in:
commit
65a85bed70
|
@ -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){
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue