Only permit deletion when not being dragged, see #414

phetsims · Oct 17, 2017 · 7680d9d · 7680d9d
1 parent a09262c
commit 7680d9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/js/view/CircuitElementNode.js b/js/view/CircuitElementNode.js
@@ -57,7 +57,11 @@ define( function( require ) {
           // prevent default so 'backspace' and 'delete' don't navigate back a page in Firefox, see
           // https://github.com/phetsims/circuit-construction-kit-common/issues/307
           event.preventDefault();
-          circuit.circuitElements.remove( circuitElement );
+
+          // Only permit deletion when not being dragged, see https://github.com/phetsims/circuit-construction-kit-common/issues/414
+          if ( !circuitElement.startVertexProperty.value.isDragged && !circuitElement.endVertexProperty.value.isDragged ) {
+            circuit.circuitElements.remove( circuitElement );
+          }
         }
       }
     } );

diff --git a/js/view/TrashButton.js b/js/view/TrashButton.js
@@ -30,7 +30,11 @@ define( function( require ) {
         scale: CCKCConstants.FONT_AWESOME_ICON_SCALE
       } ),
       listener: function() {
-        circuit.circuitElements.remove( circuitElement );
+
+        // Only permit deletion when not being dragged, see https://github.com/phetsims/circuit-construction-kit-common/issues/414
+        if ( !circuitElement.startVertexProperty.value.isDragged && !circuitElement.endVertexProperty.value.isDragged ) {
+          circuit.circuitElements.remove( circuitElement );
+        }
       },
       minXMargin: 10,
       minYMargin: 10,