asset manager fixes
This commit is contained in:
parent
6db6b48218
commit
349703173e
8 changed files with 215 additions and 88 deletions
|
|
@ -72,10 +72,6 @@ function EventManager_documentMouseDown(e) {
|
|||
manager.display.dragStart(asset.div,e.clientX,e.clientY);
|
||||
return;
|
||||
}
|
||||
}else {
|
||||
if (manager.display.contextMenu.owner == null) {
|
||||
manager.display.clearSelectedAssets();
|
||||
}
|
||||
}
|
||||
|
||||
if (e.button != 2) {
|
||||
|
|
@ -88,19 +84,23 @@ function EventManager_documentMouseUp(e) {
|
|||
var dom = document.getElementById&&!document.all;
|
||||
e=dom? e : event;
|
||||
obj =dom? e.target : e.srcElement
|
||||
//obj = manager.tools.getActivity(obj);
|
||||
|
||||
var asset = manager.getAsset(obj);
|
||||
|
||||
if (asset && e.button == 2) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (manager.display.contextMenu.owner && (!asset || asset.assetId != manager.display.contextMenu.owner.assetId)) {
|
||||
manager.display.contextMenu.hide();
|
||||
}else {
|
||||
if (!asset && manager.display.contextMenu.owner == null) {
|
||||
manager.display.clearSelectedAssets();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (!asset && obj.id.indexOf("contextMenuItem") == -1) {
|
||||
manager.display.clearSelectedAssets();
|
||||
}
|
||||
|
||||
manager.display.dragStop();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue