From 145731be9d9a025f61cd2a9c1fdeed0c4b29a153 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Mon, 27 Mar 2017 19:01:22 +0300 Subject: [PATCH 1/2] fix bug 34567 --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 4 ++-- apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +- .../spreadsheeteditor/mobile/app/controller/DocumentHolder.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index a7082b3ec..c04c20e1c 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -608,7 +608,7 @@ define([ if (me.api) { 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({ msg: me.warnMergeLostData, buttons: ['yes', 'no'], @@ -1940,7 +1940,7 @@ define([ val = info.asc_getFlags().asc_getMerge(); 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; } diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index d095496bd..cf8975daf 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -392,7 +392,7 @@ define([ }, { caption : me.txtUnmerge, - value : Asc.c_oAscMergeOptions.Unmerge + value : Asc.c_oAscMergeOptions.None } ] }) diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js index 504ce0e6c..02fdd98dd 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js @@ -127,7 +127,7 @@ define([ } break; case 'unmerge': - me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Unmerge); + me.api.asc_mergeCells(Asc.c_oAscMergeOptions.None); break; case 'hide': me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns'](); @@ -284,7 +284,7 @@ define([ event: 'merge' }); - (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merged) && + (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) && menuItems.push({ caption: me.menuUnmerge, event: 'unmerge' From 13988f599a52f12bc48d4a807bb003bd24077ece Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 27 Mar 2017 19:42:54 +0300 Subject: [PATCH 2/2] Fix Bug 34565. --- apps/documenteditor/main/app/view/ChartSettings.js | 2 +- apps/documenteditor/main/app/view/TableSettings.js | 2 +- apps/presentationeditor/main/app/view/ChartSettings.js | 2 +- apps/presentationeditor/main/app/view/TableSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/ChartSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/TableSettings.js | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index c69c6c9e5..3a255e5fc 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -166,7 +166,7 @@ define([ if (this._isChartStylesChanged) { if (rec) - this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true); else this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); } diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index cebdcf723..e758e4047 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -461,7 +461,7 @@ define([ if (this._isTemplatesChanged) { if (rec) - this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true); + this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true); else this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true); } diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index 2e02f9fad..fe10f551b 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -149,7 +149,7 @@ define([ if (this._isChartStylesChanged) { if (rec) - this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true); else this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); } diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index b63f2de75..7016b4d9c 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -376,7 +376,7 @@ define([ if (this._isTemplatesChanged) { if (rec) - this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true); + this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true); else this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true); } diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 130dca586..57bc7883b 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -181,7 +181,7 @@ define([ if (this._isChartStylesChanged) { if (rec) - this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true); else this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); } diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index ee0c44c74..c87cc2c70 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -405,7 +405,7 @@ define([ if (this._isTemplatesChanged) { if (rec) - this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true); + this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true); else this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true); } @@ -444,6 +444,7 @@ define([ self.cmbTableTemplate.menuPicker.scroller.update({alwaysVisibleY: true}); }); this.lockedControls.push(this.cmbTableTemplate); + if (this._locked) this.cmbTableTemplate.setDisabled(this._locked); } var count = self.cmbTableTemplate.menuPicker.store.length;