kopia lustrzana https://github.com/backface/turtlestitch
fixed #2294
rodzic
e5d4d869db
commit
1ba15afba7
|
@ -7,6 +7,7 @@
|
||||||
* Blocks, Objects, Threads: added "front/back" options to "go to front" layer primitive
|
* Blocks, Objects, Threads: added "front/back" options to "go to front" layer primitive
|
||||||
* updated German translation
|
* updated German translation
|
||||||
* renamed help screen for layer primitive
|
* renamed help screen for layer primitive
|
||||||
|
* fixed #2294
|
||||||
|
|
||||||
### 2018-12-07
|
### 2018-12-07
|
||||||
* GUI: fixed #2284 (executing "inherit" should not un-hide palette in presentation mode)
|
* GUI: fixed #2284 (executing "inherit" should not un-hide palette in presentation mode)
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<script type="text/javascript" src="src/blocks.js?version=2018-12-28"></script>
|
<script type="text/javascript" src="src/blocks.js?version=2018-12-28"></script>
|
||||||
<script type="text/javascript" src="src/threads.js?version=2018-12-28"></script>
|
<script type="text/javascript" src="src/threads.js?version=2018-12-28"></script>
|
||||||
<script type="text/javascript" src="src/objects.js?version=2018-12-28"></script>
|
<script type="text/javascript" src="src/objects.js?version=2018-12-28"></script>
|
||||||
<script type="text/javascript" src="src/gui.js?version=2018-12-07"></script>
|
<script type="text/javascript" src="src/gui.js?version=2018-12-28"></script>
|
||||||
<script type="text/javascript" src="src/paint.js?version=2018-10-02"></script>
|
<script type="text/javascript" src="src/paint.js?version=2018-10-02"></script>
|
||||||
<script type="text/javascript" src="src/lists.js?version=2018-10-02"></script>
|
<script type="text/javascript" src="src/lists.js?version=2018-10-02"></script>
|
||||||
<script type="text/javascript" src="src/byob.js?version=2018-11-12"></script>
|
<script type="text/javascript" src="src/byob.js?version=2018-11-12"></script>
|
||||||
|
|
11
src/gui.js
11
src/gui.js
|
@ -75,7 +75,7 @@ isRetinaSupported, SliderMorph, Animation, BoxMorph, MediaRecorder*/
|
||||||
|
|
||||||
// Global stuff ////////////////////////////////////////////////////////
|
// Global stuff ////////////////////////////////////////////////////////
|
||||||
|
|
||||||
modules.gui = '2018-December-07';
|
modules.gui = '2018-December-28';
|
||||||
|
|
||||||
// Declarations
|
// Declarations
|
||||||
|
|
||||||
|
@ -8152,7 +8152,7 @@ CostumeIconMorph.prototype.disinherit = function () {
|
||||||
idx = this.parent.children.indexOf(this);
|
idx = this.parent.children.indexOf(this);
|
||||||
if (wardrobe.sprite.inheritsAttribute('costumes')) {
|
if (wardrobe.sprite.inheritsAttribute('costumes')) {
|
||||||
wardrobe.sprite.shadowAttribute('costumes');
|
wardrobe.sprite.shadowAttribute('costumes');
|
||||||
this.object = wardrobe.sprite.costumes.at(idx - 2);
|
this.object = wardrobe.sprite.costumes.at(idx - 3);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8582,7 +8582,6 @@ WardrobeMorph.prototype.reactToDropOf = function (icon) {
|
||||||
var idx = 0,
|
var idx = 0,
|
||||||
costume = icon.object,
|
costume = icon.object,
|
||||||
top = icon.top();
|
top = icon.top();
|
||||||
|
|
||||||
icon.destroy();
|
icon.destroy();
|
||||||
this.contents.children.forEach(function (item) {
|
this.contents.children.forEach(function (item) {
|
||||||
if (item instanceof CostumeIconMorph && item.top() < top - 4) {
|
if (item instanceof CostumeIconMorph && item.top() < top - 4) {
|
||||||
|
@ -8806,7 +8805,7 @@ SoundIconMorph.prototype.disinherit = function () {
|
||||||
idx = this.parent.children.indexOf(this);
|
idx = this.parent.children.indexOf(this);
|
||||||
if (jukebox.sprite.inheritsAttribute('sounds')) {
|
if (jukebox.sprite.inheritsAttribute('sounds')) {
|
||||||
jukebox.sprite.shadowAttribute('sounds');
|
jukebox.sprite.shadowAttribute('sounds');
|
||||||
this.object = jukebox.sprite.sounds.at(idx);
|
this.object = jukebox.sprite.sounds.at(idx - 1);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8959,13 +8958,13 @@ JukeboxMorph.prototype.reactToDropOf = function (icon) {
|
||||||
|
|
||||||
icon.destroy();
|
icon.destroy();
|
||||||
this.contents.children.forEach(function (item) {
|
this.contents.children.forEach(function (item) {
|
||||||
if (item.top() < top - 4) {
|
if (item instanceof SoundIconMorph && item.top() < top - 4) {
|
||||||
idx += 1;
|
idx += 1;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.sprite.shadowAttribute('sounds');
|
this.sprite.shadowAttribute('sounds');
|
||||||
this.sprite.sounds.add(costume, idx);
|
this.sprite.sounds.add(costume, idx + 1);
|
||||||
this.updateList();
|
this.updateList();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue