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

Fix Bug 34565.

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-27 19:42:54 +03:00
parent 145731be9d
commit 13988f599a
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/view/ChartSettings.js
View file

@ -166,7 +166,7 @@ define([
if (this._isChartStylesChanged) { if (this._isChartStylesChanged) {
if (rec) if (rec)
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true);
else else
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
} }

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

@ -461,7 +461,7 @@ define([
if (this._isTemplatesChanged) { if (this._isTemplatesChanged) {
if (rec) if (rec)
this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true); this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true);
else else
this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true); this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true);
} }

2
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -149,7 +149,7 @@ define([
if (this._isChartStylesChanged) { if (this._isChartStylesChanged) {
if (rec) if (rec)
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true);
else else
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
} }

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

@ -376,7 +376,7 @@ define([
if (this._isTemplatesChanged) { if (this._isTemplatesChanged) {
if (rec) if (rec)
this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true); this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true);
else else
this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true); this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true);
} }

2
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -181,7 +181,7 @@ define([
if (this._isChartStylesChanged) { if (this._isChartStylesChanged) {
if (rec) if (rec)
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true);
else else
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
} }

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

@ -405,7 +405,7 @@ define([
if (this._isTemplatesChanged) { if (this._isTemplatesChanged) {
if (rec) if (rec)
this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true); this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true);
else else
this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true); this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true);
} }
@ -444,6 +444,7 @@ define([
self.cmbTableTemplate.menuPicker.scroller.update({alwaysVisibleY: true}); self.cmbTableTemplate.menuPicker.scroller.update({alwaysVisibleY: true});
}); });
this.lockedControls.push(this.cmbTableTemplate); this.lockedControls.push(this.cmbTableTemplate);
if (this._locked) this.cmbTableTemplate.setDisabled(this._locked);
} }
var count = self.cmbTableTemplate.menuPicker.store.length; var count = self.cmbTableTemplate.menuPicker.store.length;