make the trash can lid animate again and fix the cursor to show an x …

…when things will be removed.
picklesrus · Jan 18, 2017 · 260e42d · 260e42d
1 parent 0bbdf34
commit 260e42d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/block_svg.js b/core/block_svg.js
@@ -1181,8 +1181,10 @@ Blockly.BlockSvg.prototype.updatePreviews = function(closestConnection,
     Blockly.localConnection_ = null;
   }
 
+  var wouldDeleteBlock = this.updateCursor_(e, closestConnection);
+
   // Add an insertion marker or replacement marker if needed.
-  if (closestConnection &&
+  if (!wouldDeleteBlock && closestConnection &&
       closestConnection != Blockly.highlightedConnection_ &&
       !closestConnection.sourceBlock_.isInsertionMarker()) {
     Blockly.highlightedConnection_ = closestConnection;

diff --git a/core/scrollbar.js b/core/scrollbar.js
@@ -411,8 +411,8 @@ Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
 
   // If the origin has changed (e.g. the toolbox is moving from start to end)
   // we want to continue with the resize even if workspace metrics haven't.
-  if (this.originHasChanged) {
-    this.originHasChanged = false;
+  if (this.originHasChanged_) {
+    this.originHasChanged_ = false;
   } else if (Blockly.Scrollbar.metricsAreEquivalent_(hostMetrics,
       this.oldHostMetrics_)) {
     return;