Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature/ui modals usability 891 (#3989)

This commit is contained in:
Heiko 2017-12-14 12:59:33 +01:00 committed by Jan
parent 62d0476bd7
commit 7563ba25ea
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,9 +1,12 @@
devel devel
----- -----
* UI: pressing the return key inside a select2 box no longer triggers the modals
success function
* UI: coordinators and db servers are now in sorted order (ascending) * UI: coordinators and db servers are now in sorted order (ascending)
* UI: fixed disappearing of the navigation label in some case special case * UI: fixed disappearing of the navigation label in some cases
* fixed issue #3917: traversals with high maximal depth take extremely long * fixed issue #3917: traversals with high maximal depth take extremely long
in planning phase. in planning phase.

13
js/apps/system/_admin/aardvark/APP/frontend/js/views/modalView.js
View File

@ -97,17 +97,16 @@
// submit modal // submit modal
$(this.el).unbind('keydown'); $(this.el).unbind('keydown');
$(this.el).unbind('return'); $(this.el).unbind('return');
// $(this.el).bind('keydown', 'return', function (e) {});
$('.modal-body input').unbind('keydown'); $('.modal-body .collectionTh > input').unbind('keydown');
$('.modal-body input').unbind('return'); $('.modal-body .collectionTh > input').unbind('return');
$('.modal-body input', $(this.el)).bind('keydown', 'return', function () { $('.modal-body .collectionTh > input', $(this.el)).bind('keydown', 'return', function (e) {
$('.createModalDialog .modal-footer .button-success').click(); $('.createModalDialog .modal-footer .button-success').click();
}); });
$('.modal-body select').unbind('keydown'); $('.modal-body .collectionTh > select').unbind('keydown');
$('.modal-body select').unbind('return'); $('.modal-body .collectionTh > select').unbind('return');
$('.modal-body select', $(this.el)).bind('keydown', 'return', function () { $('.modal-body .collectionTh > select', $(this.el)).bind('keydown', 'return', function (e) {
$('.createModalDialog .modal-footer .button-success').click(); $('.createModalDialog .modal-footer .button-success').click();
}); });
}, },