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

fix can not access property type of null, stalling context menu on tree

Browse Source
This commit is contained in:
Ralf Becker 2014-10-31 08:31:23 +00:00
parent 6272b57088
commit 8abbf0d20e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/js/egw_action/egw_action_popup.js
View File

@ -611,7 +611,7 @@ function egwPopupActionImplementation()
var clipboard = {
type:[],
selected:[]
}
};
// When pasting we need to know the type of drag
for(var k in drag)
@ -625,7 +625,7 @@ function egwPopupActionImplementation()
// Hopefully that's enough for the action handlers
for(var k in selected)
{
if(selected[k].id) clipboard.selected.push({id:selected[k].id, data:selected[k].data})
if(selected[k].id) clipboard.selected.push({id:selected[k].id, data:selected[k].data});
}
// Save it in session
@ -655,7 +655,10 @@ function egwPopupActionImplementation()
drop[action.id].actionObj.execute(clipboard.selected,selected[0]);
};
var clipboard = JSON.parse(egw.getSessionItem('phpgwapi', 'egw_clipboard'));
var clipboard = JSON.parse(egw.getSessionItem('phpgwapi', 'egw_clipboard')) || {
type:[],
selected:[]
};
// Don't re-add if action already exists
if(paste_action == null)