holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for losing actions if they are re-linked to a new actionObject

Browse Source
This commit is contained in:
Nathan Gray 2015-08-11 15:44:42 +00:00
parent 24bb619f09
commit c262fb2ad0
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/js/et2_core_DOMWidget.js
View File

@ -524,7 +524,7 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
// objects // objects
widget_object = objectManager.insertObject(false, new egwActionObject( widget_object = objectManager.insertObject(false, new egwActionObject(
this.id, objectManager, new et2_action_object_impl(this), 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 else

10
etemplate/js/et2_extension_nextmatch.js
View File

@ -310,10 +310,16 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
} }
// stop invalidation in no visible tabs // stop invalidation in no visible tabs
$j(this.getInstanceManager().DOMContainer.parentNode).on('hide.et2_nextmatch', jQuery.proxy(function(e) { $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)); },this));
$j(this.getInstanceManager().DOMContainer.parentNode).on('show.et2_nextmatch', jQuery.proxy(function(e) { $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)); },this));
return true; return true;

2
etemplate/js/et2_widget_grid.js
View File

@ -933,7 +933,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
// objects // objects
widget_object = objectManager.insertObject(false, new egwActionObject( widget_object = objectManager.insertObject(false, new egwActionObject(
this.id, objectManager, new et2_action_object_impl(this), 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
)); ));
} }