summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui.js3
-rwxr-xr-xhistory.txt2
-rw-r--r--morphic.js4
3 files changed, 6 insertions, 3 deletions
diff --git a/gui.js b/gui.js
index 27a33d9..5e0571c 100644
--- a/gui.js
+++ b/gui.js
@@ -68,7 +68,7 @@ sb, CommentMorph, CommandBlockMorph*/
// Global stuff ////////////////////////////////////////////////////////
-modules.gui = '2013-April-25';
+modules.gui = '2013-April-30';
// Declarations
@@ -5053,6 +5053,7 @@ WardrobeMorph.prototype.reactToDropOf = function (icon) {
});
this.sprite.costumes.add(costume, idx + 1);
this.updateList();
+ icon.mouseClickLeft(); // select
};
// SoundIconMorph ///////////////////////////////////////////////////////
diff --git a/history.txt b/history.txt
index 6b5a3f5..0d4f780 100755
--- a/history.txt
+++ b/history.txt
@@ -1688,3 +1688,5 @@ ______
130430
------
* Objects: Costume shrink-wrapping
+* Morphic: Allow triggers to be dragged if so specified (#83)
+* GUI: select dragged costume
diff --git a/morphic.js b/morphic.js
index e2779e5..bd54d86 100644
--- a/morphic.js
+++ b/morphic.js
@@ -1035,7 +1035,7 @@
/*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio,
FileList, getBlurredShadowSupport*/
-var morphicVersion = '2013-April-26';
+var morphicVersion = '2013-April-30';
var modules = {}; // keep track of additional loaded modules
var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
@@ -8151,7 +8151,7 @@ TriggerMorph.prototype.mouseDoubleClick = function () {
};
TriggerMorph.prototype.rootForGrab = function () {
- return null;
+ return this.isDraggable ? TriggerMorph.uber.rootForGrab.call(this) : null;
};
// TriggerMorph bubble help: