pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 10:27:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/sparklines

Browse Source
This commit is contained in:
Julia Radzhabova
2016-09-29 13:36:42 +03:00
parent d71a5a777e 24c332b914
commit dee3dede32
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
View File

@ -119,8 +119,8 @@ define([
}
me.inputRange.validation = function(value) {
if (me.options.validation) {
return me.options.validation.call(me, value);
if (settings.validation) {
return settings.validation.call(me, value);
} else {
var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.Chart, value, false);
return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.txtInvalidRange : true;

6
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View File

@ -960,14 +960,14 @@ define([
};
var win = new SSE.Views.CellRangeDialog({
handler: handlerDlg,
validation: validation
handler: handlerDlg
});
win.show();
win.setSettings({
api : me.api,
range : props.getRange()
range : props.getRange(),
validation: validation
});
}
},