forked from extern/egroupware
- Fix missing change handler on some nm header templates
- Fix improper usage of jQuery.when() (it doesn't take an array) - Fix missing filter detection to not break with multiple values
This commit is contained in:
parent
e5f1e3e473
commit
34ed2d7290
@ -1968,7 +1968,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
|
||||
header.loadingFinished(deferred);
|
||||
|
||||
// Wait until all child widgets are loaded, then bind
|
||||
jQuery.when(deferred).then(function() {
|
||||
jQuery.when.apply(jQuery,deferred).then(function() {
|
||||
self._bindHeaderInput(header);
|
||||
});
|
||||
},
|
||||
@ -2140,7 +2140,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
|
||||
* is to warn & not set it, but for nextmatch we'll just add it
|
||||
* in, and let the server either set it properly, or ignore.
|
||||
*/
|
||||
if(value && child.instanceOf(et2_selectbox))
|
||||
if(value && typeof value != 'object' && child.instanceOf(et2_selectbox))
|
||||
{
|
||||
var found = typeof child.options.select_options[value] != 'undefined';
|
||||
// options is array of objects with attribute value&label
|
||||
|
@ -238,7 +238,7 @@ var et2_tabbox = et2_valueWidget.extend([et2_IInput],
|
||||
{
|
||||
tabs._loadTab(i,promises);
|
||||
}
|
||||
jQuery.when(promises).then(function() {
|
||||
jQuery.when.apply(jQuery,promises).then(function() {
|
||||
tab_deferred.resolve();
|
||||
});
|
||||
},0);
|
||||
|
@ -384,7 +384,7 @@ etemplate2.prototype.load = function(_name, _url, _data, _callback)
|
||||
}
|
||||
|
||||
// Wait for everything to be loaded, then finish it up
|
||||
jQuery.when.apply(null, deferred).done(jQuery.proxy(function() {
|
||||
jQuery.when.apply(jQuery, deferred).done(jQuery.proxy(function() {
|
||||
egw.debug("log", "Finished loading %s, triggering load event", _name);
|
||||
|
||||
// Trigger the "resize" event
|
||||
|
Loading…
Reference in New Issue
Block a user