Fixes for update

Author: SebastienTainon

frontend/stepper/js/blockly_interface.ts

@@ -99,6 +99,7 @@ class BlocklyInterface {
     private limitedPointers: any;
     private blockCounts: any;
     private dragJustTerminated: boolean;
+    private prevWidth: number;
 
     constructor(maxBlocks, subTask) {
         this.subTask = subTask;
@@ -173,7 +174,7 @@ class BlocklyInterface {
 
         this.options = options;
 
-        addExtraBlocks(this.strings, this.getDefaultColours());
+        addExtraBlocks(this.strings, this.getDefaultColours(), !this.mainContext.infos || !this.mainContext.infos.showIfMutator);
         this.createSimpleGeneratorsAndBlocks();
 
         this.display = display;
@@ -427,6 +428,24 @@ class BlocklyInterface {
         window.jQuery("#program").val(this.programs[this.codeId].javascript);
     }
 
+    updateSize(force) {
+        let panelWidth = 500;
+        if (this.languages[this.codeId] == "blockly") {
+            panelWidth = window.jQuery("#blocklyDiv").width() - 10;
+        } else {
+            panelWidth = window.jQuery("#program").width() + 20;
+        }
+        if (force || panelWidth != this.prevWidth) {
+            if (this.languages[this.codeId] == "blockly") {
+                if (this.trashInToolbox) {
+                    window.Blockly.Trashcan.prototype.MARGIN_SIDE_ = panelWidth - 90;
+                }
+                window.Blockly.svgResize(this.workspace);
+            }
+        }
+        this.prevWidth = panelWidth;
+    }
+
     highlightBlock(id, keep) {
         if (!id) {
             keep = false;

frontend/stepper/js/extra_blocks.ts

@@ -1,4 +1,4 @@
-export function addExtraBlocks(strings, defaultColors) {
+export function addExtraBlocks(strings, defaultColors, showIfMutator ) {
     window.Blockly.Blocks['controls_untilWhile'] = window.Blockly.Blocks['controls_whileUntil'];
     window.Blockly.JavaScript['controls_untilWhile'] = window.Blockly.JavaScript['controls_whileUntil'];
     window.Blockly.Python['controls_untilWhile'] = window.Blockly.Python['controls_whileUntil'];
@@ -219,7 +219,7 @@ export function addExtraBlocks(strings, defaultColors) {
         };
 
     } else {
-        if (!this.mainContext.infos || !this.mainContext.infos.showIfMutator) {
+        if (!showIfMutator) {
             var old = window.Blockly.Blocks.controls_if.init;
             window.Blockly.Blocks.controls_if.init = function () {
                 old.call(this);