summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2013-04-27 09:33:09 +0200
committerjmoenig <jens@moenig.org>2013-04-27 09:33:09 +0200
commit966d9ee24e420857f7f8afe3b7aef057efb2e9b6 (patch)
tree476ac0501a789e9424779afcf7387633e05d1546
parent2d1e450c8f7738e02776e05e290acaa85b64478b (diff)
downloadsnap-yow-966d9ee24e420857f7f8afe3b7aef057efb2e9b6.tar.gz
snap-yow-966d9ee24e420857f7f8afe3b7aef057efb2e9b6.zip
Fixed #70
-rw-r--r--blocks.js2
-rwxr-xr-xhistory.txt1
2 files changed, 3 insertions, 0 deletions
diff --git a/blocks.js b/blocks.js
index f254da9..282ed23 100644
--- a/blocks.js
+++ b/blocks.js
@@ -2766,6 +2766,7 @@ CommandBlockMorph.prototype.snap = function () {
this.startLayout();
if (target.loc === 'bottom') {
if (target.type === 'slot') {
+ this.removeHighlight();
target.element.nestedBlock(this);
} else {
target.element.nextBlock(this);
@@ -2782,6 +2783,7 @@ CommandBlockMorph.prototype.snap = function () {
}
}
} else if (target.loc === 'top') {
+ target.element.removeHighlight();
offsetY = this.bottomBlock().bottom() - this.bottom();
this.setBottom(target.element.top() + this.corner - offsetY);
this.setLeft(target.element.left());
diff --git a/history.txt b/history.txt
index d4639aa..4cda346 100755
--- a/history.txt
+++ b/history.txt
@@ -1679,3 +1679,4 @@ ______
130427
------
* Blocks: paint bucket symbol
+* highlight adjustments when merging scripts (#70)