diff --git a/blocks.js b/blocks.js index 6a44e958..90cace14 100644 --- a/blocks.js +++ b/blocks.js @@ -156,7 +156,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/ // Global stuff //////////////////////////////////////////////////////// -modules.blocks = '2015-December-15'; +modules.blocks = '2015-December-22'; var SyntaxElementMorph; var BlockMorph; @@ -1074,12 +1074,12 @@ SyntaxElementMorph.prototype.labelPart = function (spec) { null, false, { + 'any key' : ['any key'], 'up arrow': ['up arrow'], 'down arrow': ['down arrow'], 'right arrow': ['right arrow'], 'left arrow': ['left arrow'], space : ['space'], - any : ['any'], a : ['a'], b : ['b'], c : ['c'], diff --git a/history.txt b/history.txt index 576db2ec..644d09b4 100755 --- a/history.txt +++ b/history.txt @@ -2825,3 +2825,7 @@ end - bulk of 151215 * Morphic: Native Copy & Paste support, thanks, @cyderize, for this contribution!! * GUI: Code tweaks * Portuguese translation update, thanks, Manuel! + +151221 +------ +* Blocks, Objects, Threads, Locale: revert to ’any key’ in the key-pressed menu diff --git a/lang-de.js b/lang-de.js index 93a2a86b..545f1151 100644 --- a/lang-de.js +++ b/lang-de.js @@ -185,7 +185,7 @@ SnapTranslator.dict.de = { 'translator_e-mail': 'jens@moenig.org', // optional 'last_changed': - '2015-12-14', // this, too, will appear in the Translators tab + '2015-12-22', // this, too, will appear in the Translators tab // GUI // control bar: @@ -1198,6 +1198,8 @@ SnapTranslator.dict.de = { 'Pfeil nach rechts', 'left arrow': 'Pfeil nach links', + 'any key': + 'beliebige Taste', 'a': 'a', 'b': diff --git a/locale.js b/locale.js index 32d62e44..f20c79ce 100644 --- a/locale.js +++ b/locale.js @@ -42,7 +42,7 @@ /*global modules, contains*/ -modules.locale = '2015-December-21'; +modules.locale = '2015-December-22'; // Global stuff @@ -123,7 +123,7 @@ SnapTranslator.dict.en = { 'translator_e-mail': 'jens@moenig.org', 'last_changed': - '2015-12-15', + '2015-12-22', // rewordings in English avoiding having to adjust all other translations 'any': @@ -161,7 +161,7 @@ SnapTranslator.dict.de = { 'translator_e-mail': 'jens@moenig.org', 'last_changed': - '2015-12-15' + '2015-12-22' }; SnapTranslator.dict.it = { diff --git a/objects.js b/objects.js index dd5fe86a..3ccad04a 100644 --- a/objects.js +++ b/objects.js @@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/ // Global stuff //////////////////////////////////////////////////////// -modules.objects = '2015-December-19'; +modules.objects = '2015-December-22'; var SpriteMorph; var StageMorph; @@ -3746,7 +3746,7 @@ SpriteMorph.prototype.allHatBlocksForKey = function (key) { if (morph.selector) { if (morph.selector === 'receiveKey') { var evt = morph.inputs()[0].evaluate()[0]; - return evt === key || evt === 'any'; + return evt === key || evt === 'any key'; } } return false; diff --git a/threads.js b/threads.js index 2ccef96c..7e8929b1 100644 --- a/threads.js +++ b/threads.js @@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/ // Global stuff //////////////////////////////////////////////////////// -modules.threads = '2015-December-17'; +modules.threads = '2015-December-22'; var ThreadManager; var Process; @@ -2811,7 +2811,7 @@ Process.prototype.reportKeyPressed = function (keyString) { if (this.homeContext.receiver) { stage = this.homeContext.receiver.parentThatIsA(StageMorph); if (stage) { - if (this.inputOption(keyString) === 'any') { + if (this.inputOption(keyString) === 'any key') { return Object.keys(stage.keysPressed).length > 0; } return stage.keysPressed[keyString] !== undefined;