From 0e27d975c6e587b7f7c72ef6b960e21a0663388c Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Thu, 5 Dec 2013 10:01:25 +0100
Subject: fixed #264 (mapped <ctrl-enter> to green-flag instead of <enter>)

---
 history.txt | 1 +
 objects.js  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/history.txt b/history.txt
index a304638..6cd0c3f 100755
--- a/history.txt
+++ b/history.txt
@@ -2030,3 +2030,4 @@ ______
 131205
 ------
 * Threads: fixed literal-to-non-literal zero-value comparison bug
+* Objects: fixed #264 (mapped <ctrl-enter> to green-flag instead of <enter>
diff --git a/objects.js b/objects.js
index 9d7e94c..7f1e7a2 100644
--- a/objects.js
+++ b/objects.js
@@ -124,7 +124,7 @@ PrototypeHatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.objects = '2013-November-15';
+modules.objects = '2013-December-04';
 
 var SpriteMorph;
 var StageMorph;
@@ -4052,6 +4052,9 @@ StageMorph.prototype.processKeyEvent = function (event, action) {
     switch (event.keyCode) {
     case 13:
         keyName = 'enter';
+        if (event.ctrlKey || event.metaKey) {
+            keyName = 'ctrl enter';
+        }
         break;
     case 27:
         keyName = 'esc';
@@ -4084,7 +4087,7 @@ StageMorph.prototype.fireKeyEvent = function (key) {
         myself = this;
 
     this.keysPressed[evt] = true;
-    if (evt === 'enter') {
+    if (evt === 'ctrl enter') {
         return this.fireGreenFlagEvent();
     }
     if (evt === 'esc') {
-- 
cgit v1.3.1