You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2018/08/28 08:48:43 UTC
[2/4] brooklyn-ui git commit: Remove Entity from graph when
delete/backspace pressed
Remove Entity from graph when delete/backspace pressed
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/aee74eff
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/aee74eff
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/aee74eff
Branch: refs/heads/master
Commit: aee74effbc79c203253c2a9cec464d7e65d98811
Parents: 68ed4d9
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Mon Aug 27 15:11:18 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Mon Aug 27 15:31:25 2018 +0100
----------------------------------------------------------------------
.../app/components/designer/designer.directive.js | 5 +++++
.../app/components/util/d3-blueprint.js | 15 ++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/aee74eff/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/designer/designer.directive.js b/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
index 240ea96..2f91745 100644
--- a/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
+++ b/ui-modules/blueprint-composer/app/components/designer/designer.directive.js
@@ -173,6 +173,11 @@ export function designerDirective($log, $state, $q, iconGenerator, catalogApi, b
});
});
+ $element.bind('delete-entity', function (event) {
+ $log.debug('delete-entity');
+ $scope.$broadcast('d3.remove', event.detail.entity);
+ });
+
$element.bind('drop-external-node', event => {
let draggedItem = paletteDragAndDropService.draggedItem();
let target = blueprintService.find(event.detail.parentId);
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/aee74eff/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
index 4d5ff2d..c05ccf6 100755
--- a/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
+++ b/ui-modules/blueprint-composer/app/components/util/d3-blueprint.js
@@ -323,19 +323,16 @@ export function D3Blueprint(container) {
d3.event.stopPropagation();
if (d3.event.target.nodeName == 'BODY') {
if (d3.event.key === "Delete" || d3.event.key === "Backspace") {
- console.log('-- DELETE/BACKSPACE key outside of text field --');
// the selected entity:
var selected = _svg.selectAll('.entity.selected');
var nItemsSelected = selected._groups[0].length;
if (nItemsSelected > 0) {
- console.log('Dispatch event to remove node(s)');
- // entity = ...
- // let event = new CustomEvent("delete-entity", {
- // detail: {
- // entity: entity,
- // }
- // });
- // container.dispatchEvent(event);
+ let event = new CustomEvent("delete-entity", {
+ detail: {
+ entity: selected.data()[0].data,
+ }
+ });
+ container.dispatchEvent(event);
}
}
}