Fixed problem with infolog-image 'not-started' not found in grid; causes new problem with some buttons being displayed twice (caused by this.image=null in et2_widget_button.js::180)

This commit is contained in:
Andreas Stöckel 2012-03-06 16:29:18 +00:00
parent cbcefbeb1f
commit 69c7697e61
4 changed files with 17 additions and 14 deletions

View File

@ -300,7 +300,6 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
return colName; return colName;
}, },
/** /**
* Apply stored user preferences to discovered columns * Apply stored user preferences to discovered columns
*/ */

View File

@ -68,7 +68,10 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
{ {
if(!this.image) if(!this.image)
{ {
this.image = et2_createWidget("image",{label: this.options.label}); this.image = et2_createWidget("image",
{
label: this.options.label
}, this);
} }
found_image = this.image.set_src(this.options.image); found_image = this.image.set_src(this.options.image);
if(found_image) { if(found_image) {

View File

@ -122,6 +122,7 @@ var et2_image = et2_baseWidget.extend([et2_IDetachedDOM], {
} }
this.options.src = _value; this.options.src = _value;
var app = this.egw().getAppName(); var app = this.egw().getAppName();
// Handle app/image // Handle app/image