extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-15 18:38:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in automatic drag and drop -> link support detection that gave DnD to apps that couldn't handle it.

Browse Source
This commit is contained in:
Nathan Gray 2014-12-02 22:15:44 +00:00
parent 29a40c6655
commit f76e832c36
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
etemplate/js/et2_extension_nextmatch_controller.js
View File

@ -266,8 +266,22 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
if(!egw.link_get_registry(this.dataStorePrefix || this.egw.appName, 'query') || if(!egw.link_get_registry(this.dataStorePrefix || this.egw.appName, 'query') ||
egw.link_get_registry(this.dataStorePrefix || this.egw.appName, 'title')) egw.link_get_registry(this.dataStorePrefix || this.egw.appName, 'title'))
{ {
if(drop_action) drop_action.remove(); if(drop_action)
if(drag_action) drag_action.remove(); {
drop_action.remove();
if(this._actionLinks.indexOf(drop_action.id) >= 0)
{
this._actionLinks.splice(this._actionLinks.indexOf(drop_action.id),1);
}
}
if(drag_action)
{
drag_action.remove();
if(this._actionLinks.indexOf(drag_action.id) >= 0)
{
this._actionLinks.splice(this._actionLinks.indexOf(drag_action.id),1);
}
}
return; return;
} }
@ -348,6 +362,17 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
drag_action.set_dragType('link'); drag_action.set_dragType('link');
}, },
/**
* Set the data cache prefix
* Overridden from the parent to re-check automatically the added link dnd
* since the prefix is used in support detection.
*/
setPrefix: function(prefix) {
this._super.apply(this, arguments)
this._init_links_dnd(this._actionManager);
},
/** /**
* Overwrites the inherited _destroyCallback function in order to be able * Overwrites the inherited _destroyCallback function in order to be able
* to free the "rowWidget". * to free the "rowWidget".