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

[DE] Fix Bug 40936

Browse source
This commit is contained in:
Julia Radzhabova 2019-03-27 17:44:13 +03:00
parent 56967e2302
commit e798e6d4a7
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,14 +90,14 @@ define([
'<tr>', '<tr>',
'<td class="padding-large">', '<td class="padding-large">',
'<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto" style="margin-right: 5px;">', me.textGoto,'</button>', '<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto" style="margin-right: 5px;">', me.textGoto,'</button>',
'<button type="button" class="btn btn-text-default" id="bookmarks-btn-delete" style="margin-right: 5px;">', me.textDelete,'</button>', '<div style="display: inline-block; position: relative;">',
'<div style="display: inline-block; position: relative; float: right;">', '<button type="button" class="btn btn-text-default auto dropdown-toggle" id="bookmarks-btn-link" style="min-width: 75px;" data-toggle="dropdown">', me.textGetLink,'</button>',
'<button type="button" class="btn btn-text-default auto dropdown-toggle" id="bookmarks-btn-link" style="" data-toggle="dropdown">', me.textGetLink,'</button>', '<div id="id-clip-copy-box" class="dropdown-menu" style="width: 291px; left: -80px; padding: 10px;">',
'<div id="id-clip-copy-box" class="dropdown-menu" style="width: 291px; left: auto; right: 0; padding: 10px;">',
'<div id="id-dlg-clip-copy"></div>', '<div id="id-dlg-clip-copy"></div>',
'<button id="id-dlg-copy-btn" class="btn btn-text-default" style="margin-left: 5px; width: 86px;">' + me.textCopy + '</button>', '<button id="id-dlg-copy-btn" class="btn btn-text-default" style="margin-left: 5px; width: 86px;">' + me.textCopy + '</button>',
'</div>', '</div>',
'</div>', '</div>',
'<button type="button" class="btn btn-text-default" id="bookmarks-btn-delete" style="float: right;">', me.textDelete,'</button>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
@ -138,9 +138,11 @@ define([
validation : function(value) { validation : function(value) {
var exist = me.props.asc_HaveBookmark(value), var exist = me.props.asc_HaveBookmark(value),
check = me.props.asc_CheckNewBookmarkName(value); check = me.props.asc_CheckNewBookmarkName(value);
if (exist) if (exist) {
me.bookmarksList.selectRecord(me.bookmarksList.store.findWhere({value: value})); var rec = me.bookmarksList.store.findWhere({value: value});
else me.bookmarksList.selectRecord(rec);
me.bookmarksList.scrollToRecord(rec);
} else
me.bookmarksList.deselectAll(); me.bookmarksList.deselectAll();
me.btnAdd.setDisabled(!check && !exist); me.btnAdd.setDisabled(!check && !exist);
me.btnGoto.setDisabled(!exist); me.btnGoto.setDisabled(!exist);
@ -182,7 +184,7 @@ define([
el: $('#bookmarks-btn-add'), el: $('#bookmarks-btn-add'),
disabled: true disabled: true
}); });
this.$window.find('#bookmarks-btn-add').on('click', _.bind(this.onDlgBtnClick, this)); this.btnAdd.on('click', _.bind(this.addBookmark, this));
this.btnGoto = new Common.UI.Button({ this.btnGoto = new Common.UI.Button({
el: $('#bookmarks-btn-goto'), el: $('#bookmarks-btn-goto'),
@ -273,11 +275,6 @@ define([
}, },
onDlgBtnClick: function(event) { onDlgBtnClick: function(event) {
var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event;
if (state == 'add') {
this.props.asc_AddBookmark(this.txtName.getValue());
}
this.close(); this.close();
}, },
@ -322,6 +319,14 @@ define([
} }
}, },
addBookmark: function(btn, eOpts){
this.props.asc_AddBookmark(this.txtName.getValue());
this.refreshBookmarks();
var rec = this.bookmarksList.store.findWhere({value: this.txtName.getValue()});
this.bookmarksList.selectRecord(rec);
this.bookmarksList.scrollToRecord(rec);
},
onDblClickBookmark: function(listView, itemView, record) { onDblClickBookmark: function(listView, itemView, record) {
this.props.asc_SelectBookmark(record.get('value')); this.props.asc_SelectBookmark(record.get('value'));
}, },
@ -376,7 +381,7 @@ define([
textClose: 'Close', textClose: 'Close',
textHidden: 'Hidden bookmarks', textHidden: 'Hidden bookmarks',
txtInvalidName: 'Bookmark name can only contain letters, digits and underscores, and should begin with the letter', txtInvalidName: 'Bookmark name can only contain letters, digits and underscores, and should begin with the letter',
textGetLink: 'Link to bookmark', textGetLink: 'Get Link',
textCopy: 'Copy' textCopy: 'Copy'
}, DE.Views.BookmarksDialog || {})) }, DE.Views.BookmarksDialog || {}))

2
apps/documenteditor/main/locale/en.json
View file

@ -1009,7 +1009,7 @@
"DE.Views.BookmarksDialog.textName": "Name", "DE.Views.BookmarksDialog.textName": "Name",
"DE.Views.BookmarksDialog.textSort": "Sort by", "DE.Views.BookmarksDialog.textSort": "Sort by",
"DE.Views.BookmarksDialog.textTitle": "Bookmarks", "DE.Views.BookmarksDialog.textTitle": "Bookmarks",
"DE.Views.BookmarksDialog.textGetLink": "Link to Bookmark", "DE.Views.BookmarksDialog.textGetLink": "Get Link",
"DE.Views.BookmarksDialog.textCopy": "Copy", "DE.Views.BookmarksDialog.textCopy": "Copy",
"DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter", "DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
"DE.Views.ChartSettings.textAdvanced": "Show advanced settings", "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",