pull/3/merge
jmoenig 2014-07-21 08:23:14 +02:00
rodzic e65422141e
commit 15a751ad85
2 zmienionych plików z 9 dodań i 4 usunięć

Wyświetl plik

@ -2176,7 +2176,6 @@ ______
------ ------
* Blocks: add “ringify” to every context menu that already has “unringify” * Blocks: add “ringify” to every context menu that already has “unringify”
140708 140708
------ ------
* Threads: show error messages for custom blocks (propagating to the scripts top block) * Threads: show error messages for custom blocks (propagating to the scripts top block)
@ -2211,3 +2210,7 @@ ______
* GUI: Use new mechanism for unique costume names on the paint editor, renamed costumes and costumes dragged and dropped onto sprite icons * GUI: Use new mechanism for unique costume names on the paint editor, renamed costumes and costumes dragged and dropped onto sprite icons
* add “letter” option to the split blocks list of delimiters, Thanks, Michael! * add “letter” option to the split blocks list of delimiters, Thanks, Michael!
* update German translation * update German translation
140721
------
* fixed #518

Wyświetl plik

@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.threads = '2014-July-18'; modules.threads = '2014-July-21';
var ThreadManager; var ThreadManager;
var Process; var Process;
@ -2871,7 +2871,8 @@ Context.prototype.continuation = function () {
Context.prototype.copyForContinuation = function () { Context.prototype.copyForContinuation = function () {
var cpy = copy(this), var cpy = copy(this),
cur = cpy, cur = cpy,
isReporter = !(this.expression instanceof Array); isReporter = !(this.expression instanceof Array ||
isString(this.expression));
if (isReporter) { if (isReporter) {
cur.prepareContinuationForBinding(); cur.prepareContinuationForBinding();
while (cur.parentContext) { while (cur.parentContext) {
@ -2886,7 +2887,8 @@ Context.prototype.copyForContinuation = function () {
Context.prototype.copyForContinuationCall = function () { Context.prototype.copyForContinuationCall = function () {
var cpy = copy(this), var cpy = copy(this),
cur = cpy, cur = cpy,
isReporter = !(this.expression instanceof Array); isReporter = !(this.expression instanceof Array ||
isString(this.expression));
if (isReporter) { if (isReporter) {
this.expression = this.expression.fullCopy(); this.expression = this.expression.fullCopy();
this.inputs = []; this.inputs = [];