Commit c0234c7c authored by Julia Radzhabova's avatar Julia Radzhabova

[SSE] Fix Bug 34998.

parent ce1ab38f
...@@ -145,7 +145,8 @@ define([ ...@@ -145,7 +145,8 @@ define([
this.mnuChartTypePicker.selectRecord(record, true); this.mnuChartTypePicker.selectRecord(record, true);
if (record) { if (record) {
this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls')); this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls'));
} } else
this.btnChartType.setIconCls('');
this.updateChartStyles(this.api.asc_getChartPreviews(type)); this.updateChartStyles(this.api.asc_getChartPreviews(type));
this._state.ChartType = type; this._state.ChartType = type;
} }
......
...@@ -128,7 +128,8 @@ define([ ...@@ -128,7 +128,8 @@ define([
this.mnuChartTypePicker.selectRecord(record, true); this.mnuChartTypePicker.selectRecord(record, true);
if (record) { if (record) {
this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls')); this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls'));
} } else
this.btnChartType.setIconCls('');
this.updateChartStyles(this.api.asc_getChartPreviews(type)); this.updateChartStyles(this.api.asc_getChartPreviews(type));
this._state.ChartType = type; this._state.ChartType = type;
} }
......
...@@ -160,7 +160,8 @@ define([ ...@@ -160,7 +160,8 @@ define([
this.mnuChartTypePicker.selectRecord(record, true); this.mnuChartTypePicker.selectRecord(record, true);
if (record) { if (record) {
this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls')); this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls'));
} } else
this.btnChartType.setIconCls('');
this.updateChartStyles(this.api.asc_getChartPreviews(type)); this.updateChartStyles(this.api.asc_getChartPreviews(type));
this._state.ChartType = type; this._state.ChartType = type;
} }
...@@ -226,7 +227,8 @@ define([ ...@@ -226,7 +227,8 @@ define([
this.mnuSparkTypePicker.selectRecord(record, true); this.mnuSparkTypePicker.selectRecord(record, true);
if (record) { if (record) {
this.btnSparkType.setIconCls('item-chartlist ' + record.get('iconCls')); this.btnSparkType.setIconCls('item-chartlist ' + record.get('iconCls'));
} } else
this.btnSparkType.setIconCls('');
this._state.SparkType = type; this._state.SparkType = type;
styleChanged = true; styleChanged = true;
} }
......
...@@ -1332,7 +1332,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' ...@@ -1332,7 +1332,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.mnuChartTypePicker.selectRecord(record, true); this.mnuChartTypePicker.selectRecord(record, true);
if (record) { if (record) {
this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls')); this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls'));
} } else
this.btnChartType.setIconCls('');
this._noApply = false; this._noApply = false;
...@@ -1389,6 +1390,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' ...@@ -1389,6 +1390,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.mnuSparkTypePicker.selectRecord(record, true); this.mnuSparkTypePicker.selectRecord(record, true);
if (record) if (record)
this.btnSparkType.setIconCls('item-chartlist ' + record.get('iconCls')); this.btnSparkType.setIconCls('item-chartlist ' + record.get('iconCls'));
else
this.btnSparkType.setIconCls('');
this.updateSparkStyles((this.sparklineStyles) ? this.sparklineStyles : props.asc_getStyles()); this.updateSparkStyles((this.sparklineStyles) ? this.sparklineStyles : props.asc_getStyles());
...@@ -1443,10 +1446,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' ...@@ -1443,10 +1446,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
}, },
getSettings: function() { getSettings: function() {
var value, var value;
type = this.mnuChartTypePicker.getSelectedRec()[0].get('type');
if (this.isChart) { if (this.isChart) {
var rec = this.mnuChartTypePicker.getSelectedRec(),
type = (rec && rec.length>0) ? rec[0].get('type') : this.currentChartType;
this.chartSettings.putType(type); this.chartSettings.putType(type);
this.chartSettings.putInColumns(this.cmbDataDirect.getValue()==1); this.chartSettings.putInColumns(this.cmbDataDirect.getValue()==1);
...@@ -1503,7 +1508,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' ...@@ -1503,7 +1508,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
if (this.isChart) { if (this.isChart) {
var isvalid; var isvalid;
if (!_.isEmpty(this.txtDataRange.getValue())) { if (!_.isEmpty(this.txtDataRange.getValue())) {
isvalid = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, this.txtDataRange.getValue(), true, this.cmbDataDirect.getValue()==0, this.mnuChartTypePicker.getSelectedRec()[0].get('type')); var rec = this.mnuChartTypePicker.getSelectedRec(),
type = (rec && rec.length>0) ? rec[0].get('type') : this.currentChartType;
isvalid = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, this.txtDataRange.getValue(), true, this.cmbDataDirect.getValue()==0, type);
if (isvalid == Asc.c_oAscError.ID.No) if (isvalid == Asc.c_oAscError.ID.No)
return true; return true;
} else } else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment