fixed a glitch in the custom block help mechanism (show only the prototype)

pull/89/head
jmoenig 2019-02-15 17:53:11 +01:00
rodzic cbe0dc6723
commit 0565310e52
3 zmienionych plików z 9 dodań i 6 usunięć

Wyświetl plik

@ -41,6 +41,7 @@
### 2019-02-15
* BYOB: tweaked yesterday's fix...
* Blocks: fixed a glitch in the custom block help mechanism (show only the prototype)
### 2019-02-14
* BYOB: keep empty numerical input slots in custom blocks empty when relabelling

Wyświetl plik

@ -6,7 +6,7 @@
<link rel="shortcut icon" href="src/favicon.ico">
<script type="text/javascript" src="src/morphic.js?version=2019-02-07"></script>
<script type="text/javascript" src="src/widgets.js?version=2018-10-02"></script>
<script type="text/javascript" src="src/blocks.js?version=2019-02-07"></script>
<script type="text/javascript" src="src/blocks.js?version=2019-02-15"></script>
<script type="text/javascript" src="src/threads.js?version=2019-01-28"></script>
<script type="text/javascript" src="src/objects.js?version=2019-02-07"></script>
<script type="text/javascript" src="src/gui.js?version=2019-02-07"></script>

Wyświetl plik

@ -148,7 +148,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
// Global stuff ////////////////////////////////////////////////////////
modules.blocks = '2019-February-07';
modules.blocks = '2019-February-15';
var SyntaxElementMorph;
var BlockMorph;
@ -3129,6 +3129,7 @@ BlockMorph.prototype.showHelp = function () {
blockEditor,
pic = new Image(),
help,
def,
comment,
block,
spec,
@ -3164,11 +3165,12 @@ BlockMorph.prototype.showHelp = function () {
};
if (this.isCustomBlock) {
comment = this.isGlobal ?
this.definition.comment
: this.scriptTarget().getMethod(this.blockSpec).comment;
def = this.isGlobal ? this.definition
: this.scriptTarget().getMethod(this.blockSpec);
comment = def.comment;
if (comment) {
block = this.fullCopy();
block = def.blockInstance();
block.refreshDefaults(def);
block.addShadow();
comment = comment.fullCopy();
comment.contents.parse();