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

Update table settings in strict mode: change table style by one user and getting changes by another user (combodataview didn't update.).

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-28 10:47:36 +03:00
parent 6019ee19e0
commit 4cc0721829
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -430,7 +430,7 @@ define([
if (this._initSettings) if (this._initSettings)
this.createDelayedElements(); this.createDelayedElements();
this.disableControls(this._locked); var updateState = this.disableControls(this._locked); // need to update combodataview after disabled state
if (props ) if (props )
{ {
@ -451,7 +451,7 @@ define([
//for table-template //for table-template
value = props.get_TableStyle(); value = props.get_TableStyle();
if (this._state.TemplateId!==value || this._isTemplatesChanged) { if (this._state.TemplateId!==value || this._isTemplatesChanged || updateState) {
this.cmbTableTemplate.suspendEvents(); this.cmbTableTemplate.suspendEvents();
var rec = this.cmbTableTemplate.menuPicker.store.findWhere({ var rec = this.cmbTableTemplate.menuPicker.store.findWhere({
templateId: value templateId: value
@ -773,6 +773,7 @@ define([
item.setDisabled(disable); item.setDisabled(disable);
}); });
this.linkAdvanced.toggleClass('disabled', disable); this.linkAdvanced.toggleClass('disabled', disable);
return !disable;
} }
}, },

5
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -357,7 +357,7 @@ define([
if (this._initSettings) if (this._initSettings)
this.createDelayedElements(); this.createDelayedElements();
this.disableControls(this._locked); var updateState = this.disableControls(this._locked); // need to update combodataview after disabled state
if (props ) if (props )
{ {
@ -366,7 +366,7 @@ define([
//for table-template //for table-template
var value = props.get_TableStyle(); var value = props.get_TableStyle();
if (this._state.TemplateId!==value || this._isTemplatesChanged) { if (this._state.TemplateId!==value || this._isTemplatesChanged || updateState) {
this.cmbTableTemplate.suspendEvents(); this.cmbTableTemplate.suspendEvents();
var rec = this.cmbTableTemplate.menuPicker.store.findWhere({ var rec = this.cmbTableTemplate.menuPicker.store.findWhere({
templateId: value templateId: value
@ -663,6 +663,7 @@ define([
item.setDisabled(disable); item.setDisabled(disable);
}); });
this.linkAdvanced.toggleClass('disabled', disable); this.linkAdvanced.toggleClass('disabled', disable);
return !disable;
} }
}, },

5
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -325,7 +325,7 @@ define([
if (this._initSettings) if (this._initSettings)
this.createDelayedControls(); this.createDelayedControls();
this.disableControls(this._locked); var updateState = this.disableControls(this._locked); // need to update combodataview after disabled state
if (props )//formatTableInfo if (props )//formatTableInfo
{ {
@ -395,7 +395,7 @@ define([
//for table-template //for table-template
value = props.asc_getTableStyleName(); value = props.asc_getTableStyleName();
if (this._state.TemplateName!==value || this._isTemplatesChanged) { if (this._state.TemplateName!==value || this._isTemplatesChanged || updateState) {
this.cmbTableTemplate.suspendEvents(); this.cmbTableTemplate.suspendEvents();
var rec = this.cmbTableTemplate.menuPicker.store.findWhere({ var rec = this.cmbTableTemplate.menuPicker.store.findWhere({
name: value name: value
@ -508,6 +508,7 @@ define([
item.setDisabled(disable); item.setDisabled(disable);
}); });
this.linkAdvanced.toggleClass('disabled', disable); this.linkAdvanced.toggleClass('disabled', disable);
return !disable;
} }
}, },