From ceb5fb0a7072263a599d93ed6826346796f38fbc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 24 Mar 2017 13:56:16 +0300 Subject: [PATCH] [SSE] Disabled adding sparklines and changing data/location range. --- .../app/template/ChartSettingsDlg.template | 58 +++++++++---------- .../main/app/view/ChartSettingsDlg.js | 5 +- .../main/app/view/Toolbar.js | 16 ++--- 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template index af5a8ef43..693beaab9 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template @@ -335,35 +335,35 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
-
-
- -
- -
-
-
- -
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index e82275ced..abc2a8cd8 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -844,7 +844,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' labelText: this.textSingle, name: 'asc-radio-sparkline' }); - */ + this.txtSparkDataRange = new Common.UI.InputField({ el : $('#spark-dlg-txt-range'), name : 'range', @@ -872,6 +872,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' el: $('#spark-dlg-btn-location-data') }); this.btnSelectLocationData.on('click', _.bind(this.onSelectLocationData, this)); + */ this._arrEmptyCells = [ { value: Asc.c_oAscEDispBlanksAs.Gap, displayValue: this.textGaps }, @@ -1402,6 +1403,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.spnSparkMinValue.setValue((props.asc_getManualMin() !== null) ? props.asc_getManualMin() : '', true); this.spnSparkMaxValue.setValue((props.asc_getManualMax() !== null) ? props.asc_getManualMax() : '', true); + /* var value = props.asc_getDataRanges(); if (value && value.length==2) { this.txtSparkDataRange.setValue((value[0]) ? value[0] : ''); @@ -1425,6 +1427,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true; }; } + */ this._changedProps = new Asc.sparklineGroup(); this._noApply = false; diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index a9d418818..d095496bd 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1551,10 +1551,10 @@ define([ { id: 'menu-chart-group-hbar', caption: me.textBar }, { id: 'menu-chart-group-area', caption: me.textArea, inline: true }, { id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true }, - { id: 'menu-chart-group-stock', caption: me.textStock, inline: true }, - { id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks }, - { id: 'menu-chart-group-sparkline', inline: true }, - { id: 'menu-chart-group-sparkwin', inline: true } + { id: 'menu-chart-group-stock', caption: me.textStock, inline: true } + // ,{ id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks }, + // { id: 'menu-chart-group-sparkline', inline: true }, + // { id: 'menu-chart-group-sparkwin', inline: true } ]), store: new Common.UI.DataViewStore([ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true}, @@ -1581,10 +1581,10 @@ define([ { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, allowSelected: true, iconCls: 'area-stack'}, { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, allowSelected: true, iconCls: 'area-pstack'}, { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, allowSelected: true, iconCls: 'point-normal'}, - { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'}, - { group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark}, - { group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark}, - { group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark} + { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'} + // ,{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark}, + // { group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark}, + // { group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark} ]), itemTemplate: _.template('
') });