extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

When server gives taglist options via ajax, take them all. Only filter local suggestions.

Browse Source
This commit is contained in:
Nathan Gray 2016-03-25 16:04:27 +00:00
parent 8105b93f80
commit 12ca409137
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,8 +267,8 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
if(this.options.autocomplete_url && !jQuery.isEmptyObject(this.options.select_options)) if(this.options.autocomplete_url && !jQuery.isEmptyObject(this.options.select_options))
{ {
var widget = this; var widget = this;
this.taglist.setData(function(query) { this.taglist.setData(function(query, cfg) {
return widget._data.call(widget,query); return widget._data.call(widget,query, cfg);
}); });
} }
@ -420,9 +420,10 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
* typed, or query via AJAX if user typed something * typed, or query via AJAX if user typed something
* *
* @param {string} query * @param {string} query
* @param {Object} cfg Magicsuggest's internal configuration
* @returns {Array} * @returns {Array}
*/ */
_data: function(query) { _data: function(query, cfg) {
var return_value = this.options.select_options || {}; var return_value = this.options.select_options || {};
@ -446,10 +447,13 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
else if (query.trim().length >= this.taglist_options.minChars || this._query_server) else if (query.trim().length >= this.taglist_options.minChars || this._query_server)
{ {
// No options - ask server // No options - ask server
return this.options.autocomplete_url; return_value = this.options.autocomplete_url;
} }
this._query_server = false; this._query_server = false;
// Turn on local filtering, or trust server to do it
cfg.mode = typeof return_value === 'string' ? 'remote' : 'local'
return return_value; return return_value;
}, },
@ -519,8 +523,8 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
if(this.taglist == null || !source) return; if(this.taglist == null || !source) return;
var widget = this; var widget = this;
this.taglist.setData(function(query) { this.taglist.setData(function(query, cfg) {
return widget._data.call(widget,query); return widget._data.call(widget,query, cfg);
}); });
} }
}, },
@ -551,8 +555,8 @@ var et2_taglist = (function(){ "use strict"; return et2_selectbox.extend([et2_IR
if(this.taglist == null) return; if(this.taglist == null) return;
var widget = this; var widget = this;
this.taglist.setData(function(query) { this.taglist.setData(function(query, cfg) {
return widget._data.call(widget,query); return widget._data.call(widget,query, cfg);
}); });
}, },

2
phpgwapi/js/jquery/magicsuggest/magicsuggest.js vendored
View File

@ -823,7 +823,7 @@
var json = null, data = source || cfg.data; var json = null, data = source || cfg.data;
if(data !== null) { if(data !== null) {
if(typeof(data) === 'function'){ if(typeof(data) === 'function'){
data = data.call(ms, ms.getRawValue()); data = data.call(ms, ms.getRawValue(),cfg);
} }
if(typeof(data) === 'string') { // get results from ajax if(typeof(data) === 'string') { // get results from ajax
$(ms).trigger('beforeload', [ms]); $(ms).trigger('beforeload', [ms]);