kopia lustrzana https://github.com/backface/turtlestitch
fixed #521
deleting variable watchers by dropping them on the palette resulted in wrong ones to be created when showing them againpull/3/merge
rodzic
15a751ad85
commit
df25b4dc73
|
@ -2214,3 +2214,7 @@ ______
|
|||
140721
|
||||
------
|
||||
* fixed #518
|
||||
|
||||
140722
|
||||
------
|
||||
* Objects, Threads: fixed #521 (deleting variable watchers by dropping them on the palette results in wrong ones to be created when showing them again)
|
||||
|
|
|
@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/
|
|||
|
||||
// Global stuff ////////////////////////////////////////////////////////
|
||||
|
||||
modules.objects = '2014-July-17';
|
||||
modules.objects = '2014-July-22';
|
||||
|
||||
var SpriteMorph;
|
||||
var StageMorph;
|
||||
|
@ -3545,6 +3545,9 @@ SpriteMorph.prototype.toggleVariableWatcher = function (varName, isGlobal) {
|
|||
}
|
||||
|
||||
// if no watcher exists, create a new one
|
||||
if (isNil(isGlobal)) {
|
||||
isGlobal = contains(this.variables.parentFrame.names(), varName);
|
||||
}
|
||||
watcher = new WatcherMorph(
|
||||
varName,
|
||||
this.blockColor.variables,
|
||||
|
|
|
@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
|
|||
|
||||
// Global stuff ////////////////////////////////////////////////////////
|
||||
|
||||
modules.threads = '2014-July-21';
|
||||
modules.threads = '2014-July-22';
|
||||
|
||||
var ThreadManager;
|
||||
var Process;
|
||||
|
@ -1109,6 +1109,7 @@ Process.prototype.doShowVar = function (varName) {
|
|||
target,
|
||||
label,
|
||||
others,
|
||||
isGlobal,
|
||||
name = varName;
|
||||
|
||||
if (name instanceof Context) {
|
||||
|
@ -1135,7 +1136,11 @@ Process.prototype.doShowVar = function (varName) {
|
|||
return;
|
||||
}
|
||||
// if no watcher exists, create a new one
|
||||
if (target.owner) {
|
||||
isGlobal = contains(
|
||||
this.homeContext.receiver.variables.parentFrame.names(),
|
||||
varName
|
||||
);
|
||||
if (isGlobal || target.owner) {
|
||||
label = name;
|
||||
} else {
|
||||
label = name + ' (temporary)';
|
||||
|
|
Ładowanie…
Reference in New Issue