From 86672fec4a5684c1d33a75cc3ff9ec5ee13fced3 Mon Sep 17 00:00:00 2001 From: jmoenig Date: Wed, 1 Oct 2014 10:12:37 +0200 Subject: fixed #599 disable IDE keyboard shortcuts in presentation mode --- history.txt | 1 + objects.js | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/history.txt b/history.txt index fb2c065..19b962a 100755 --- a/history.txt +++ b/history.txt @@ -2294,3 +2294,4 @@ ______ 140930 ------ * Threads: workaround for some REPORT issues +* Objects: fixed #599 (disable IDE keyboard shortcuts in presentation mode) diff --git a/objects.js b/objects.js index cca5439..905b3d1 100644 --- a/objects.js +++ b/objects.js @@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/ // Global stuff //////////////////////////////////////////////////////// -modules.objects = '2014-September-30'; +modules.objects = '2014-October-01'; var SpriteMorph; var StageMorph; @@ -4675,6 +4675,7 @@ StageMorph.prototype.fireKeyEvent = function (key) { var evt = key.toLowerCase(), hats = [], procs = [], + ide = this.parentThatIsA(IDE_Morph), myself = this; this.keysPressed[evt] = true; @@ -4682,19 +4683,24 @@ StageMorph.prototype.fireKeyEvent = function (key) { return this.fireGreenFlagEvent(); } if (evt === 'ctrl f') { - return this.parentThatIsA(IDE_Morph).currentSprite.searchBlocks(); + if (!ide.isAppMode) {ide.currentSprite.searchBlocks(); } + return; } if (evt === 'ctrl n') { - return this.parentThatIsA(IDE_Morph).createNewProject(); + if (!ide.isAppMode) {ide.createNewProject(); } + return; } if (evt === 'ctrl o') { - return this.parentThatIsA(IDE_Morph).openProjectsBrowser(); + if (!ide.isAppMode) {ide.openProjectsBrowser(); } + return; } if (evt === 'ctrl s') { - return this.parentThatIsA(IDE_Morph).save(); + if (!ide.isAppMode) {ide.save(); } + return; } if (evt === 'ctrl shift s') { - return this.parentThatIsA(IDE_Morph).saveProjectsBrowser(); + if (!ide.isAppMode) {return ide.saveProjectsBrowser(); } + return; } if (evt === 'esc') { return this.fireStopAllEvent(); -- cgit v1.3.1