summaryrefslogtreecommitdiff
path: root/threads.js
diff options
context:
space:
mode:
authorGubolin <gubolin@fantasymail.de>2015-05-06 15:32:17 +0200
committerGubolin <gubolin@fantasymail.de>2015-05-06 15:32:17 +0200
commitb0d5fca03273d74c009c1415285c0ec375e1f848 (patch)
tree38a6a8ab1714f0f0945cd6b1a093503c8e9ac127 /threads.js
parent8a83be1c8a37ed3b3672c77028741ec5ec8c7b5a (diff)
parent83628bc0aca42c078a96b0a6fbb2675cf6cae5c3 (diff)
downloadsnap-b0d5fca03273d74c009c1415285c0ec375e1f848.tar.gz
snap-b0d5fca03273d74c009c1415285c0ec375e1f848.zip
merge upstream
Diffstat (limited to 'threads.js')
-rw-r--r--threads.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/threads.js b/threads.js
index e8fb936..1b8fdc6 100644
--- a/threads.js
+++ b/threads.js
@@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
// Global stuff ////////////////////////////////////////////////////////
-modules.threads = '2015-March-25';
+modules.threads = '2015-May-01';
var ThreadManager;
var Process;
@@ -1928,6 +1928,7 @@ Process.prototype.doAsk = function (data) {
isStage = this.blockReceiver() instanceof StageMorph,
activePrompter;
+ stage.keysPressed = {};
if (!this.prompter) {
activePrompter = detect(
stage.children,
@@ -2297,6 +2298,9 @@ Process.prototype.reportJoinWords = function (aList) {
// Process string ops
Process.prototype.reportLetter = function (idx, string) {
+ if (string instanceof List) { // catch a common user error
+ return '';
+ }
var i = +(idx || 0),
str = (string || '').toString();
return str[i - 1] || '';