0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

don't close menu on enter, but submit input on enter in autocompletemenu if no menu item was selected

Browse source
This commit is contained in:
rlx 2013-07-22 12:58:07 +00:00
parent 256c0cfa0d
commit dc0c504809
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/Ox.UI/js/Form/Input.js
View file

@ -482,7 +482,7 @@ Ox.Input = function(options, self) {
} }
function constructAutocompleteMenu() { function constructAutocompleteMenu() {
var menu = Ox.Menu({ return Ox.Menu({
element: self.$input, element: self.$input,
id: self.options.id + 'Menu', // fixme: we do this in other places ... are we doing it the same way? var name?, id: self.options.id + 'Menu', // fixme: we do this in other places ... are we doing it the same way? var name?,
maxWidth: self.options.autocompleteSelectMaxWidth, maxWidth: self.options.autocompleteSelectMaxWidth,
@ -490,13 +490,17 @@ Ox.Input = function(options, self) {
left: 4, left: 4,
top: 0 top: 0
} }
//size: self.options.size
}) })
.addClass('OxAutocompleteMenu') .addClass('OxAutocompleteMenu')
.bindEvent({ .bindEvent({
click: clickMenu click: clickMenu,
key_enter: function() {
if (self.$autocompleteMenu.is(':visible')) {
self.$autocompleteMenu.hideMenu();
submit();
}
}
}); });
return menu;
} }
function autovalidate() { function autovalidate() {

2
source/Ox.UI/js/Menu/Menu.js
View file

@ -192,8 +192,6 @@ Ox.Menu = function(options, self) {
// called on key.enter // called on key.enter
if (self.options.selected > -1) { if (self.options.selected > -1) {
clickItem(self.options.selected); clickItem(self.options.selected);
} else {
that.hideMenu();
} }
} }