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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-28 11:07:50 +03:00
parent bfe97358ad 13988f599a
commit e85a8a6eb0
9 changed files with 12 additions and 11 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);
} }

4
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -608,7 +608,7 @@ define([
if (me.api) { if (me.api) {
var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge(); var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge();
if ((merged !== Asc.c_oAscMergeOptions.Merged) && me.api.asc_mergeCellsDataLost(item.value)) { if ((merged !== Asc.c_oAscMergeOptions.Merge) && me.api.asc_mergeCellsDataLost(item.value)) {
Common.UI.warning({ Common.UI.warning({
msg: me.warnMergeLostData, msg: me.warnMergeLostData,
buttons: ['yes', 'no'], buttons: ['yes', 'no'],
@ -1940,7 +1940,7 @@ define([
val = info.asc_getFlags().asc_getMerge(); val = info.asc_getFlags().asc_getMerge();
if (this._state.merge !== val) { if (this._state.merge !== val) {
toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merged, true); toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true);
this._state.merge = val; this._state.merge = val;
} }

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;

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

@ -392,7 +392,7 @@ define([
}, },
{ {
caption : me.txtUnmerge, caption : me.txtUnmerge,
value : Asc.c_oAscMergeOptions.Unmerge value : Asc.c_oAscMergeOptions.None
} }
] ]
}) })

4
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -127,7 +127,7 @@ define([
} }
break; break;
case 'unmerge': case 'unmerge':
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Unmerge); me.api.asc_mergeCells(Asc.c_oAscMergeOptions.None);
break; break;
case 'hide': case 'hide':
me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns'](); me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns']();
@ -284,7 +284,7 @@ define([
event: 'merge' event: 'merge'
}); });
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merged) && (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
menuItems.push({ menuItems.push({
caption: me.menuUnmerge, caption: me.menuUnmerge,
event: 'unmerge' event: 'unmerge'