forked from extern/egroupware
Fix for losing actions if they are re-linked to a new actionObject
This commit is contained in:
parent
24bb619f09
commit
c262fb2ad0
@ -524,7 +524,7 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
|
||||
// objects
|
||||
widget_object = objectManager.insertObject(false, new egwActionObject(
|
||||
this.id, objectManager, new et2_action_object_impl(this),
|
||||
objectManager.manager.getActionById(this.id) || objectManager.manager
|
||||
this._actionManager || objectManager.manager.getActionById(this.id) || objectManager.manager
|
||||
));
|
||||
}
|
||||
else
|
||||
|
@ -310,10 +310,16 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
|
||||
}
|
||||
// stop invalidation in no visible tabs
|
||||
$j(this.getInstanceManager().DOMContainer.parentNode).on('hide.et2_nextmatch', jQuery.proxy(function(e) {
|
||||
this.controller._grid.doInvalidate = false;
|
||||
if(this.controller && this.controller._grid)
|
||||
{
|
||||
this.controller._grid.doInvalidate = false;
|
||||
}
|
||||
},this));
|
||||
$j(this.getInstanceManager().DOMContainer.parentNode).on('show.et2_nextmatch', jQuery.proxy(function(e) {
|
||||
this.controller._grid.doInvalidate = true;
|
||||
if(this.controller && this.controller._grid)
|
||||
{
|
||||
this.controller._grid.doInvalidate = true;
|
||||
}
|
||||
},this));
|
||||
|
||||
return true;
|
||||
|
@ -933,7 +933,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
|
||||
// objects
|
||||
widget_object = objectManager.insertObject(false, new egwActionObject(
|
||||
this.id, objectManager, new et2_action_object_impl(this),
|
||||
objectManager.manager.getActionById(this.id) || objectManager.manager
|
||||
this._actionManager || objectManager.manager.getActionById(this.id) || objectManager.manager
|
||||
));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user