fixed #1082 - revert to ’any key’ in the key-pressed menu

dev
Jens Mönig 2015-12-22 08:00:52 +01:00
rodzic e3142b1fa5
commit 300a6dff7a
6 zmienionych plików z 16 dodań i 10 usunięć

Wyświetl plik

@ -156,7 +156,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.blocks = '2015-December-15'; modules.blocks = '2015-December-22';
var SyntaxElementMorph; var SyntaxElementMorph;
var BlockMorph; var BlockMorph;
@ -1074,12 +1074,12 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
null, null,
false, false,
{ {
'any key' : ['any key'],
'up arrow': ['up arrow'], 'up arrow': ['up arrow'],
'down arrow': ['down arrow'], 'down arrow': ['down arrow'],
'right arrow': ['right arrow'], 'right arrow': ['right arrow'],
'left arrow': ['left arrow'], 'left arrow': ['left arrow'],
space : ['space'], space : ['space'],
any : ['any'],
a : ['a'], a : ['a'],
b : ['b'], b : ['b'],
c : ['c'], c : ['c'],

Wyświetl plik

@ -2825,3 +2825,7 @@ end - bulk of 151215
* Morphic: Native Copy & Paste support, thanks, @cyderize, for this contribution!! * Morphic: Native Copy & Paste support, thanks, @cyderize, for this contribution!!
* GUI: Code tweaks * GUI: Code tweaks
* Portuguese translation update, thanks, Manuel! * Portuguese translation update, thanks, Manuel!
151221
------
* Blocks, Objects, Threads, Locale: revert to any key in the key-pressed menu

Wyświetl plik

@ -185,7 +185,7 @@ SnapTranslator.dict.de = {
'translator_e-mail': 'translator_e-mail':
'jens@moenig.org', // optional 'jens@moenig.org', // optional
'last_changed': '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 // GUI
// control bar: // control bar:
@ -1198,6 +1198,8 @@ SnapTranslator.dict.de = {
'Pfeil nach rechts', 'Pfeil nach rechts',
'left arrow': 'left arrow':
'Pfeil nach links', 'Pfeil nach links',
'any key':
'beliebige Taste',
'a': 'a':
'a', 'a',
'b': 'b':

Wyświetl plik

@ -42,7 +42,7 @@
/*global modules, contains*/ /*global modules, contains*/
modules.locale = '2015-December-21'; modules.locale = '2015-December-22';
// Global stuff // Global stuff
@ -123,7 +123,7 @@ SnapTranslator.dict.en = {
'translator_e-mail': 'translator_e-mail':
'jens@moenig.org', 'jens@moenig.org',
'last_changed': 'last_changed':
'2015-12-15', '2015-12-22',
// rewordings in English avoiding having to adjust all other translations // rewordings in English avoiding having to adjust all other translations
'any': 'any':
@ -161,7 +161,7 @@ SnapTranslator.dict.de = {
'translator_e-mail': 'translator_e-mail':
'jens@moenig.org', 'jens@moenig.org',
'last_changed': 'last_changed':
'2015-12-15' '2015-12-22'
}; };
SnapTranslator.dict.it = { SnapTranslator.dict.it = {

Wyświetl plik

@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.objects = '2015-December-19'; modules.objects = '2015-December-22';
var SpriteMorph; var SpriteMorph;
var StageMorph; var StageMorph;
@ -3746,7 +3746,7 @@ SpriteMorph.prototype.allHatBlocksForKey = function (key) {
if (morph.selector) { if (morph.selector) {
if (morph.selector === 'receiveKey') { if (morph.selector === 'receiveKey') {
var evt = morph.inputs()[0].evaluate()[0]; var evt = morph.inputs()[0].evaluate()[0];
return evt === key || evt === 'any'; return evt === key || evt === 'any key';
} }
} }
return false; return false;

Wyświetl plik

@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.threads = '2015-December-17'; modules.threads = '2015-December-22';
var ThreadManager; var ThreadManager;
var Process; var Process;
@ -2811,7 +2811,7 @@ Process.prototype.reportKeyPressed = function (keyString) {
if (this.homeContext.receiver) { if (this.homeContext.receiver) {
stage = this.homeContext.receiver.parentThatIsA(StageMorph); stage = this.homeContext.receiver.parentThatIsA(StageMorph);
if (stage) { if (stage) {
if (this.inputOption(keyString) === 'any') { if (this.inputOption(keyString) === 'any key') {
return Object.keys(stage.keysPressed).length > 0; return Object.keys(stage.keysPressed).length > 0;
} }
return stage.keysPressed[keyString] !== undefined; return stage.keysPressed[keyString] !== undefined;