extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better handling of binding change handlers to async loaded header templates

Browse Source
This commit is contained in:
Nathan Gray 2013-10-09 15:14:25 +00:00
parent 0163442f37
commit 17c933cded
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etemplate/js/et2_extension_nextmatch.js
View File

@ -1244,7 +1244,6 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
$j(template.getDOMNode()).on("load", $j(template.getDOMNode()).on("load",
jQuery.proxy(function() { jQuery.proxy(function() {
parse.call(this, template); parse.call(this, template);
//this.loadingFinished();
this.resize(); this.resize();
}, this) }, this)
); );
@ -1559,10 +1558,11 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
// Left & Right headers // Left & Right headers
this.headers = []; this.headers = [];
this.header_div = jQuery(document.createElement("div")).addClass("ui-helper-clearfix ui-helper-reset").prependTo(this.div);
if(this.nextmatch.options.header_left || this.nextmatch.options.header_right) if(this.nextmatch.options.header_left || this.nextmatch.options.header_right)
{ {
var headers = [this.nextmatch.options.header_left, this.nextmatch.options.header_right]; var headers = [this.nextmatch.options.header_left, this.nextmatch.options.header_right];
this.header_div = jQuery(document.createElement("div")).addClass("ui-helper-clearfix ui-helper-reset").prependTo(this.div);
for(var i = 0; i < headers.length; i++) { for(var i = 0; i < headers.length; i++) {
if(headers[i]) if(headers[i])
{ {
@ -1685,6 +1685,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
var header = et2_createWidget("template", {"id": template_name}, this); var header = et2_createWidget("template", {"id": template_name}, this);
jQuery(header.getDOMNode()).addClass(left_or_right == "left" ? "et2_hbox_left":"et2_hbox_right").addClass("nm_header"); jQuery(header.getDOMNode()).addClass(left_or_right == "left" ? "et2_hbox_left":"et2_hbox_right").addClass("nm_header");
this.headers.push(header); this.headers.push(header);
$j(header.getDOMNode()).on("load", jQuery.proxy(function() {this._bindHeaderInput(header);},this));
}, },
/** /**
@ -1890,13 +1891,10 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
} }
return null; return null;
}, },
doLoadingFinished: function() {
this._super.apply(this,arguments);
var header = this;
// Add change handlers to input widgets in the header _bindHeaderInput: function(_widget) {
this.iterateOver(function(_widget) { var header = this;
_widget.iterateOver(function(_widget){
// Previously set change function // Previously set change function
var widget_change = _widget.change; var widget_change = _widget.change;
_widget.change = function(_node) { _widget.change = function(_node) {
@ -1905,7 +1903,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
// Update filters // Update filters
if(result && _widget.isDirty()) { if(result && _widget.isDirty()) {
var value = this.getInstanceManager().getValues(header); var value = this.getInstanceManager().getValues(this);
// Filter now // Filter now
header.nextmatch.applyFilters(value[header.nextmatch.id]); header.nextmatch.applyFilters(value[header.nextmatch.id]);
} }
@ -1914,7 +1912,6 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
// Set activeFilters to current value // Set activeFilters to current value
//self.nextmatch.activeFilters[_widget.id] = _widget.getValue(); //self.nextmatch.activeFilters[_widget.id] = _widget.getValue();
}, this, et2_inputWidget); }, this, et2_inputWidget);
return true;
} }
}); });
et2_register_widget(et2_nextmatch_header_bar, ["nextmatch_header_bar"]); et2_register_widget(et2_nextmatch_header_bar, ["nextmatch_header_bar"]);