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

Merge pull request #710 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE] Fix  Bug 48724
This commit is contained in:
Julia Radzhabova 2021-02-16 11:45:06 +03:00 committed by GitHub
parent 4ddb60c044 224daa4f61
commit 45e23c0d91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/spreadsheeteditor/main/app/view/DataValidationDialog.js
View file

@ -479,6 +479,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
var between = (data==Asc.EDataValidationOperator.Between || data==Asc.EDataValidationOperator.NotBetween);
var source = (allow==Asc.c_oAscEDataValidationType.Custom || allow==Asc.c_oAscEDataValidationType.List);
this.minMaxTr.toggleClass('hidden', allow==Asc.c_oAscEDataValidationType.None || source || !between);
this._isMinMaxVisible = !(allow==Asc.c_oAscEDataValidationType.None || source || !between);
this.sourceTr.toggleClass('hidden', allow==Asc.c_oAscEDataValidationType.None || !source && between );
this.dropdownTr.toggleClass('hidden', allow!=Asc.c_oAscEDataValidationType.List);
@ -537,7 +538,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
var focusedInput,
lblField,
error,
minVisible = this.inputRangeMin.isVisible();
minVisible = this._isMinMaxVisible;
var callback2 = function(isvalid) {
if (isvalid === Asc.c_oAscError.ID.No) {
isvalid = me.props.asc_checkValid();
@ -577,7 +578,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
(isvalid === Asc.c_oAscError.ID.No) && callback.call(me);
};
var callback1 = function(isvalid) {
if (me.inputRangeMax.isVisible() && isvalid === Asc.c_oAscError.ID.No) {
if (me._isMinMaxVisible && isvalid === Asc.c_oAscError.ID.No) {
isvalid = me.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.DataValidation, me.props.asc_getFormula2() ? me.props.asc_getFormula2().asc_getValue() : null, true, undefined, type);
if (isvalid !== Asc.c_oAscError.ID.No) {
focusedInput = me.inputRangeMax;