extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Taglist fixes:

Browse Source 
- Fix toggle multiple got stuck with single value
- Fix keyboard navigation
This commit is contained in:
Nathan Gray 2016-03-10 17:44:51 +00:00
parent fbe3d2cc7d
commit 040ee0253f
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.etemplate_widget_taglist.inc.php
View File

@ -107,7 +107,7 @@ class etemplate_widget_taglist extends etemplate_widget
foreach((array) $value as $key => $val)
{
if(!$this->attrs['allowFreeEntries'] && !array_key_exists($val,$allowed))
if(count($allowed) && !$this->attrs['allowFreeEntries'] && !array_key_exists($val,$allowed))
{
self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($allowed))),'');
unset($value[$key]);
@ -132,6 +132,10 @@ class etemplate_widget_taglist extends etemplate_widget
{
self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
}
if($this->attrs['multiple'] == false)
{
$value = array_shift($value);
}
$valid =& self::get_array($validated, $form_name, true);
// returning null instead of array(), as array() will be overwritten by etemplate_new::complete_array_merge()
// with preserved old content and therefore user can not empty a taglist

29
etemplate/js/et2_widget_taglist.js
View File

@ -277,6 +277,20 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
$j('.egw_tooltip').hide();
widget.div.addClass('ui-state-active');
})
// If not using autoSelect, avoid some errors with selection starting
// with the group
.on('load expand', function() {
if(widget.taglist && widget.taglist_options.groupBy)
{
window.setTimeout(function() {
if(widget && widget.taglist.combobox)
{
widget.taglist.combobox.find('.ms-res-group.ms-res-item-active')
.removeClass('ms-res-item-active');
}
},1);
}
})
// Position absolute to break out of containers
.on('expand', jQuery.proxy(function(c) {
var taglist = this.taglist;
@ -714,11 +728,14 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
if(this.taglist == null) return;
// Switch to multiple if allowed and more than 1 value
var multiple = this.options.multiple ? values.length > 1 : false;
if(multiple !== this._multiple)
// Switch multiple according to attribute and more than 1 value
if(this.options.multiple !== true)
{
this._set_multiple(multiple);
var multiple = this.options.multiple ? values.length > 1 : false;
if(multiple !== this._multiple)
{
this._set_multiple(multiple);
}
}
this.taglist.clear(true);
@ -785,8 +802,7 @@ var et2_taglist_account = (function(){ "use strict"; return et2_taglist.extend(
},
},
lib_options: {
minChars: 2,
toggleOnClick: true
minChars: 2
},
init:function ()
@ -1082,7 +1098,6 @@ var et2_taglist_category = (function(){ "use strict"; return et2_taglist.extend(
}
},
lib_options: {
toggleOnClick: true
},
init: function() {