et2_widget_selectbox.js

nathangray 2016-03-21 22:25:33 UTC #1

Author: nathangray
New Revision: 55474

URL: http://svn.stylite.de/viewvc/egroupware?rev=55474&view=rev
Log:
Better handling of missing top-level cache (happens in sitemgr) to avoid infinite loops

Modified:
trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js

Modified: trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js?rev=55474&r1=55473&r2=55474&view=diff

— trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_selectbox.js Mon Mar 21 23:25:33 2016
@@ -1110,11 +1110,12 @@
options_string = options_string.replace(/,+$/, ‘’);

	var cache_id = widget._type+'_'+options_string;

```
  var cache = (
```

  var cache_owner = (
  	egw.window.et2_selectbox ?
  		egw.window.et2_selectbox :
  		egw(window).window.et2_selectbox

```
  ).type_cache[cache_id];
```

```
  ).type_cache;
```

  var cache = cache_owner[cache_id];

  // Options for a selectbox in a nextmatch must be returned now, as the
  // widget we have is not enough to set the options later.

@@ -1139,7 +1140,7 @@
).sendRequest(!in_nextmatch);
if(typeof cache === ‘undefined’)
{

  		egw.window.et2_selectbox.type_cache[cache_id] = req;

  		cache_owner[cache_id] = req;
  	}
  	cache = req;
  }

@@ -1147,10 +1148,10 @@
{
// pending, wait for it
cache.done(jQuery.proxy(function(response) {

  		egw.window.et2_selectbox.type_cache[this.cache_id] = response.response[0].data||undefined;

  		cache = cache_owner[cache_id] = response.response[0].data||undefined;
  		// Set select_options in attributes in case we get a resonse before
  		// the widget is finished loading (otherwise it will re-set to {})

  		attrs.select_options = egw.window.et2_selectbox.type_cache[this.cache_id];

  		attrs.select_options = cache;

  		egw.window.setTimeout(jQuery.proxy(function() {
  			// Avoid errors if widget is destroyed before the timeout

@@ -1181,7 +1182,7 @@
// Try again - ask the server with the current value this time
if(missing_option)
{

  			delete egw.window.et2_selectbox.type_cache[cache_id];

  			delete cache_owner[cache_id];
  			return this.cached_server_side_options(widget, options_string, attrs);
  		}
  	}

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