R55523 - in /trunk: egroupware/api/js/etemplate/et2_widget_taglist.js phpgwapi/js/jquery/magicsuggest/magicsuggest.js

[nathangray]

Author: nathangray
New Revision: 55523

URL: http://svn.stylite.de/viewvc/egroupware?rev=55523&view=rev
Log:
When server gives taglist options via ajax, take them all. Only filter local suggestions.

Modified:
trunk/egroupware/api/js/etemplate/et2_widget_taglist.js
trunk/phpgwapi/js/jquery/magicsuggest/magicsuggest.js

Modified: trunk/egroupware/api/js/etemplate/et2_widget_taglist.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_widget_taglist.js?rev=55523&r1=55522&r2=55523&view=diff

— trunk/egroupware/api/js/etemplate/et2_widget_taglist.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_taglist.js Fri Mar 25 17:04:27 2016
@@ -267,8 +267,8 @@
if(this.options.autocomplete_url && !jQuery.isEmptyObject(this.options.select_options))
{
var widget = this;

•   	this.taglist.setData(function(query) {
  

•   		return widget._data.call(widget,query);
  

•   	this.taglist.setData(function(query, cfg) {
  

•   		return widget._data.call(widget,query, cfg);
    	});
    }
  

@@ -420,9 +420,10 @@
* typed, or query via AJAX if user typed something
*
* @param {string} query

• • @param {Object} cfg Magicsuggest’s internal configuration
  • @returns {Array}
    */

• _data: function(query) {

• _data: function(query, cfg) {

  var return_value = this.options.select_options || {};
  

@@ -446,9 +447,12 @@
else if (query.trim().length >= this.taglist_options.minChars || this._query_server)
{
// No options - ask server

•   	return this.options.autocomplete_url;
  

•   	return_value = this.options.autocomplete_url;
    }
    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;
  

  },
  @@ -519,8 +523,8 @@
  if(this.taglist == null || !source) return;

    	var widget = this;
  

•   	this.taglist.setData(function(query) {
  

•   		return widget._data.call(widget,query);
  

•   	this.taglist.setData(function(query, cfg) {
  

•   		return widget._data.call(widget,query, cfg);
    	});
    }
  

  },
  @@ -551,8 +555,8 @@

    if(this.taglist == null) return;
    var widget = this;
  

•   this.taglist.setData(function(query) {
  

•   	return widget._data.call(widget,query);
  

•   this.taglist.setData(function(query, cfg) {
  

•   	return widget._data.call(widget,query, cfg);
    });
  

  },

Modified: trunk/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/js/jquery/magicsuggest/magicsuggest.js?rev=55523&r1=55522&r2=55523&view=diff

— trunk/phpgwapi/js/jquery/magicsuggest/magicsuggest.js (original)
+++ trunk/phpgwapi/js/jquery/magicsuggest/magicsuggest.js Fri Mar 25 17:04:27 2016
@@ -823,7 +823,7 @@
var json = null, data = source || cfg.data;
if(data !== null) {
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
                     $(ms).trigger('beforeload', [ms]);
  

---

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs