From 306a77c0399fee4055c6d0722d1e34642d603ee8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Jul 2018 12:46:18 -0700 Subject: [PATCH] fix delete event --- scripts/system/edit.js | 8 ++------ scripts/system/libraries/entityList.js | 12 +++++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 73088560d9..c40f97a606 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -1573,15 +1573,11 @@ function deleteSelectedEntities() { Entities.deleteEntity(entityID); } } - + if (savedProperties.length > 0) { SelectionManager.clearSelections(); pushCommandForSelections([], savedProperties); - - entityListTool.webView.emitScriptEvent(JSON.stringify({ - type: "deleted", - ids: deletedIDs - })); + entityListTool.deleteEntities(deletedIDs); } } } diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js index de8e5d9c06..ae89b63ea6 100644 --- a/scripts/system/libraries/entityList.js +++ b/scripts/system/libraries/entityList.js @@ -93,12 +93,18 @@ EntityListTool = function() { }; that.removeEntities = function (deletedIDs, selectedIDs) { - var data = { + emitJSONScriptEvent({ type: 'removeEntities', deletedIDs: deletedIDs, selectedIDs: selectedIDs - }; - webView.emitScriptEvent(JSON.stringify(data)); + }); + }; + + that.deleteEntities = function (deletedIDs) { + emitJSONScriptEvent({ + type: "deleted", + ids: deletedIDs + }); }; function valueIfDefined(value) {