holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring back enter action for taglist-email widget

Browse Source
This commit is contained in:
Hadi Nategh 2016-06-24 16:27:02 +02:00
parent 54852ea6a7
commit 66f1e302d2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/et2_widget_taglist.js
View File

@ -279,7 +279,7 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
.on("load", function() {jQuery('.loading',this.container).remove();}) .on("load", function() {jQuery('.loading',this.container).remove();})
// Keep focus when selecting from the list // Keep focus when selecting from the list
.on("selectionchange", function() { .on("selectionchange", function() {
if(document.activeElement === document.body || if(document.activeElement === document.body ||
widget.div.has(document.activeElement).length > 0) widget.div.has(document.activeElement).length > 0)
{ {
jQuery('input',this.container).focus(); jQuery('input',this.container).focus();
@ -481,7 +481,9 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
* @returns {Boolean} * @returns {Boolean}
*/ */
_keyup: function(e, taglist, event) { _keyup: function(e, taglist, event) {
if(event.which === jQuery.ui.keyCode.ENTER && taglist.combobox.find('.ms-res-item.ms-res-item-active').length==0) if(event.which === jQuery.ui.keyCode.ENTER
&& taglist.combobox.find('.ms-res-item.ms-res-item-active').length==0
&& this._type !== 'taglist-email')
{ {
// Change keycode to abort the validation process // Change keycode to abort the validation process
// This means enter does not add a tag // This means enter does not add a tag