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

[SSE] Fix Bug 34790.

Browse source
This commit is contained in:
Julia Radzhabova 2017-04-18 16:16:03 +03:00
parent 88729eded2
commit 5921702c18
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -810,7 +810,20 @@ define([
props = me.api.asc_getChartObject();
if (props) {
props.putType(record.get('type'));
(ischartedit) ? me.api.asc_editChartDrawingObject(props) : me.api.asc_addChartDrawingObject(props);
var range = props.getRange(),
isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, range, true, !props.getInColumns(), props.getType());
if (isvalid == Asc.c_oAscError.ID.No) {
(ischartedit) ? me.api.asc_editChartDrawingObject(props) : me.api.asc_addChartDrawingObject(props);
} else {
Common.UI.warning({
msg: (isvalid == Asc.c_oAscError.ID.StockChartError) ? me.errorStockChart : ((isvalid == Asc.c_oAscError.ID.MaxDataSeriesError) ? me.errorMaxRows : me.txtInvalidRange),
callback: function() {
_.defer(function(btn) {
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
})
}
});
}
}
}
}
@ -3055,7 +3068,10 @@ define([
txtSorting: 'Sorting',
txtSortSelected: 'Sort selected',
textLongOperation: 'Long operation',
warnLongOperation: 'The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?'
warnLongOperation: 'The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?',
txtInvalidRange: 'ERROR! Invalid cells range',
errorMaxRows: 'ERROR! The maximum number of data series per chart is 255.',
errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.'
}, SSE.Controllers.Toolbar || {}));
});

3
apps/spreadsheeteditor/main/locale/en.json
View file

@ -365,6 +365,8 @@
"SSE.Controllers.Statusbar.warnDeleteSheet": "The worksheet might contain data. Are you sure you want to proceed?",
"SSE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"SSE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
"SSE.Controllers.Toolbar.errorMaxRows": "ERROR! The maximum number of data series per chart is 255",
"SSE.Controllers.Toolbar.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
"SSE.Controllers.Toolbar.textAccent": "Accents",
"SSE.Controllers.Toolbar.textBracket": "Brackets",
"SSE.Controllers.Toolbar.textCancel": "Cancel",
@ -372,6 +374,7 @@
"SSE.Controllers.Toolbar.textFraction": "Fractions",
"SSE.Controllers.Toolbar.textFunction": "Functions",
"SSE.Controllers.Toolbar.textIntegral": "Integrals",
"SSE.Controllers.Toolbar.txtInvalidRange": "ERROR! Invalid cells range",
"SSE.Controllers.Toolbar.textLargeOperator": "Large Operators",
"SSE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
"SSE.Controllers.Toolbar.textMatrix": "Matrices",