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

Merge pull request #470 from ONLYOFFICE/fix/bug-46177

Browse source 
[SSE] Fix Bug 46177
This commit is contained in:
Julia Radzhabova 2020-08-18 16:29:32 +03:00 committed by GitHub
parent 614505780b f425cb5665
commit bccfd639ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js
View file

@ -70,6 +70,16 @@ define([ 'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem
scope: this scope: this
}) })
}, options); }, options);
this.options.handler = function(result, value) {
if ( result != 'ok' || this.isNameValid() ) {
if (options.handler)
options.handler.call(this, result, value);
return;
}
return true;
};
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
this._changedProps = null; this._changedProps = null;
@ -88,8 +98,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem
// Style & Size // Style & Size
this.inputHeader = new Common.UI.InputField({ this.inputHeader = new Common.UI.InputField({
el : $('#sliceradv-text-header'), el : $('#sliceradv-text-header'),
allowBlank : false, allowBlank : true,
blankError : me.txtEmpty,
style : 'width: 178px;' style : 'width: 178px;'
}).on('changed:after', function() { }).on('changed:after', function() {
me.isCaptionChanged = true; me.isCaptionChanged = true;
@ -372,10 +381,6 @@ define([ 'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem
me.isAltDescChanged = true; me.isAltDescChanged = true;
}); });
this.on('show', function(obj) {
obj.getChild('.footer .primary').focus();
});
this.afterRender(); this.afterRender();
}, },
@ -526,6 +531,15 @@ define([ 'text!spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.tem
} }
}, },
isNameValid: function() {
if (this.isNameChanged && _.isEmpty(this.inputName.getValue())) {
this.setActiveCategory(2);
this.inputName.cmpEl.find('input').focus();
return false;
}
return true;
},
textTitle: 'Slicer - Advanced Settings', textTitle: 'Slicer - Advanced Settings',
textHeader: 'Header', textHeader: 'Header',
strStyle: 'Style', strStyle: 'Style',