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

Merge branch 'feature/Bug_41231' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2019-09-18 18:24:12 +03:00
parent bd44f6b773 498013d6d3
commit 0594718432
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/documenteditor/main/app/view/BookmarksDialog.js
View file

@ -137,9 +137,10 @@ define([
value : '', value : '',
maxLength: 40, maxLength: 40,
validation : function(value) { validation : function(value) {
var check = me.props.asc_CheckNewBookmarkName(value); var check = me.props.asc_CheckNewBookmarkName(value),
me.btnAdd.setDisabled(!check); exist = me.props.asc_HaveBookmark(value);
return (check || _.isEmpty(value)) ? true : me.txtInvalidName; me.btnAdd.setDisabled(!check && !exist);
return (check || _.isEmpty(value) || exist) ? true : me.txtInvalidName;
} }
}).on ('changing', function (input, value) { }).on ('changing', function (input, value) {
var exist = me.props.asc_HaveBookmark(value); var exist = me.props.asc_HaveBookmark(value);
@ -315,7 +316,10 @@ define([
gotoBookmark: function(btn, eOpts){ gotoBookmark: function(btn, eOpts){
var rec = this.bookmarksList.getSelectedRec(); var rec = this.bookmarksList.getSelectedRec();
rec && this.props.asc_SelectBookmark(rec.get('value')); if (rec)
this.props.asc_SelectBookmark(rec.get('value'));
else if (this.txtName.getValue()!=='')
this.props.asc_SelectBookmark(this.txtName.getValue());
}, },
addBookmark: function(btn, eOpts){ addBookmark: function(btn, eOpts){