Change block structure

graham-trott · graham-trott · commit 868cbb09bcb1 · 2020-06-03T16:22:56.000+01:00
diff --git a/iwsy/iwsy.js b/iwsy/iwsy.js
@@ -142,46 +142,32 @@ const IWSY = (container, text) => {
         block.textPanel = text;
     };
 
-    // Set the content of a block
-    const doSetContent = (spec) => {
-        const block = script.blocks[spec.block];
-        const content = script.content[spec.content];
-        if (!block) {
-            throw Error(`Block '${block}' cannot be found`);
-        }
-        if (!block.element) {
-            createBlock(block);
-        }
-        const converter = new showdown.Converter();
-        block.textPanel.innerHTML = converter.makeHtml(content.split(`%0a`).join(`\n`));
-    };
-
     // Set the content of a block
     const setcontent = step => {
-        if (step.blocks) {
-            for (const spec of step.blocks)
-            {
-                doSetContent(spec);
+        for (const item of step.blocks)
+        {
+            for (const block of script.blocks) {
+                if (block.name === item.block) {
+                    if (!block.element) {
+                        createBlock(block);
+                    }
+                    const content = script.content[item.content];
+                    const converter = new showdown.Converter();
+                    block.textPanel.innerHTML = converter.makeHtml(content.split(`%0a`).join(`\n`));
+                }
             }
-        } else {
-            doSetContent(step);
         }
         step.next();
     };
 
     // Show or hide a block
     const doShowHide = (step, showHide) => {
         if (script.speed !== `scan`) {
-            if (Array.isArray(step.blocks)) {
-                for (const name of step.blocks)
-                {
-                    script.blocks[name].opacity = showHide ? `1.0` : `0.0`;
-                    script.blocks[name].element.style[`opacity`] = script.blocks[name].opacity;
-                }
-            } else {
-                script.blocks[step.blocks].opacity = showHide ? `1.0` : `0.0`;
-                script.blocks[step.blocks].element.style[`opacity`] = script.blocks[step.blocks].opacity;
-            }
+        for (const name of step.blocks)
+        {
+            script.blocks[name].opacity = showHide ? `1.0` : `0.0`;
+            script.blocks[name].element.style[`opacity`] = script.blocks[name].opacity;
+        }
         }
         step.next();
     };
@@ -196,7 +182,15 @@ const IWSY = (container, text) => {
 
     // Fade up or down
     const doFade = (step, upDown) => {
-        const stepBlocks = step.blocks;
+        const stepBlocks = [];
+        for (const b of step.blocks) {
+            script.blocks.forEach((block, index) => {
+                if (block.name === b) {
+                    stepBlocks.push(index);
+                }
+            });
+        }            
+
         for (const b of stepBlocks) {
             const block = script.blocks[b];
             if (!block.element) {
@@ -419,8 +413,16 @@ const IWSY = (container, text) => {
 
     // Handle a transition
     const transition = step => {
-        const block = script.blocks[step.block];
-        const target = script.blocks[step.target];
+        let block = null;
+        let target = null;
+        script.blocks.forEach((item, index) => {
+            if (item.name === step.block) {
+                block = item;
+            }
+            if (item.name === step.target) {
+                target = item;
+            }
+        });
         if (script.speed === `scan`) {
             doTransitionStep(block, target, 1.0);
             step.next();
diff --git a/iwsy/resources/ecs/blocks.txt b/iwsy/resources/ecs/blocks.txt
@@ -5,14 +5,10 @@
     import div Panel and variable Presentation
     
     div Editor
+    div Title
+    div Table
     div Row
     div Cell
-    div Title
-    table Table
-    tr TR
-    td TD
-    span BlockNameSpan
-    input BlockNameInput
     input PropertyValue
     button EditButton
     button SaveButton
@@ -21,21 +17,18 @@
     a Link
     variable Blocks
     variable Block
-    variable BlockNames
-    variable BlockName
+    variable PropertyDefaults
     variable PropertyNames
     variable PropertyName
-    variable Properties
     variable SelectedBlock
-    variable Action
     variable Message
     variable N
-    variable B
+    variable NBlocks
     
     put -1 into SelectedBlock
     
-    rest get Properties from `/resources/json/properties.json`
-    put the json keys of Properties into PropertyNames
+    rest get PropertyNames from `/resources/json/propertyNames.json`
+    rest get PropertyDefaults from `/resources/json/propertyDefaults.json`
     
     on message go to Start
     set ready
@@ -50,8 +43,6 @@ Start:
 
 Restart:
 	put property `blocks` of Presentation into Blocks
-    put the json keys of Blocks into BlockNames
-
 	clear Panel
     create Row in Panel
     set the style of Row to `display:flex`
@@ -67,98 +58,72 @@ Restart:
     set attribute `src` of AddBlock to `resources/icon/plus.png`
     on click AddBlock
     begin
-    	put prompt `Name of new block:` with `new block` into BlockName
         set Block to object
         put 0 into N
         while N is less than the json count of PropertyNames
         begin
         	put element N of PropertyNames into PropertyName
-            set property PropertyName of Block to property PropertyName of Properties
+            set property PropertyName of Block to property PropertyName of PropertyDefaults
         	add 1 to N
         end
-        set property BlockName of Blocks to Block
+        json add Block to Blocks
         set property `blocks` of Presentation to Blocks
         go to Restart
     end
 
-	put the json count of BlockNames into N
-    set the elements of BlockNameSpan to N
-    set the elements of BlockNameInput to N
-    set the elements of EditButton to N
-    set the elements of SaveButton to N
-    set the elements of Editor to N
-    set the elements of DeleteBlock to N
+	put the json count of Blocks into NBlocks
+    set the elements of EditButton to NBlocks
+    set the elements of SaveButton to NBlocks
+    set the elements of Editor to NBlocks
+    set the elements of DeleteBlock to NBlocks
     create Table in Panel
     set the style of Table to `width:100%`
-    put 0 into B
-    while B is less than the elements of EditButton
+    put 0 into N
+    while N is less than NBlocks
     begin
-    	put element B of BlockNames into BlockName
-        create TR in Table
-        create TD in TR
-        set the style of TD to `width:8em;border:1px solid black;padding-left:0.5em`
-        index BlockNameSpan to B
-        create BlockNameSpan in TD
-        set the content of BlockNameSpan to BlockName
-        index BlockNameInput to B
-        create BlockNameInput in TD
-        set the style of BlockNameInput to `width:100%;display:none`
-        set the content of BlockNameInput to BlockName
-        create TD in TR
-    	set the style of TD to `border:1px solid black`
-        index EditButton to B
-        index DeleteBlock to B
-        index Editor to B
-        create Row in TD
-        set the style of Row to `display:flex`
-        create EditButton in Row
-        set the style of EditButton to `flex:1`
-        set the text of EditButton to `Edit`
+        index EditButton to N
+        index DeleteBlock to N
+        index Editor to N
+        create Row in Table
         create Cell in Row
-        set the style of Cell to `width:1.4em;text-align:center`
+        set the style of Cell to `width:100%;display:flex`
+        create EditButton in Cell
+        set the style of EditButton to `flex:1`
+    	put element N of Blocks into Block
+        set the text of EditButton to property `name` of Block
         create Link in Cell
         create DeleteBlock in Link
-        set the style of DeleteBlock to `width:1em;margin-top:0.1em`
+        set the style of DeleteBlock to `width:1em;margin:0.1em 0 0 0.2em`
         set attribute `src` of DeleteBlock to `/resources/icon/stop.png`
-        create Editor in TD
-        set the style of Editor to `display:none`
-    	add 1 to B
+        create Editor in Row
+        set the style of Editor to `margin:0.5em;border:1px solid black;padding:0.2em;display:none`
+    	add 1 to N
     end
     on click EditButton
     begin
     	gosub to SaveSelectedBlock
         put the index of EditButton into SelectedBlock
         put 0 into N
-        while N is less than the json count of BlockNames
+        while N is less than NBlocks
         begin
-           	index EditButton to N
-        	set style `background` of EditButton to ``
-            if N is not SelectedBlock set the text of EditButton to `Edit`
-            index BlockNameSpan to N
-            index BlockNameInput to N
-            set the content of BlockNameSpan to the text of BlockNameInput
-            set style `display` of BlockNameSpan to `inline`
-            set style `display` of BlockNameInput to `none`
-            index Editor to N
-            set style `display` of Editor to `none`
+        	if N is not SelectedBlock
+            begin
+                index EditButton to N
+                set style `background` of EditButton to ``
+                index Editor to N
+                set style `display` of Editor to `none`
+                clear Editor
+            end
             add 1 to N
         end
         index EditButton to SelectedBlock
-        put the text of EditButton into Action
-    	if Action is `Edit`
+        index Editor to SelectedBlock
+		if style `display` of Editor is `none`
         begin
         	set style `background` of EditButton to `lightgray`
-        	set the text of EditButton to `Properties`
-            index BlockNameSpan to SelectedBlock
-            index BlockNameInput to SelectedBlock
             index SaveButton to SelectedBlock
-            set style `display` of BlockNameSpan to `none`
-            set style `display` of BlockNameInput to `inline`
-            index Editor to SelectedBlock
             set style `display` of Editor to `block`
-            clear Editor
-            put element SelectedBlock of BlockNames into BlockName
-            put property BlockName of Blocks into Block
+            put element SelectedBlock of Blocks into Block
             put the json count of PropertyNames into N
             set the elements of PropertyValue to N
             put 0 into N
@@ -173,7 +138,7 @@ Restart:
                 index PropertyValue to N
                 create PropertyValue in Row
                 set the style of PropertyValue to `flex:1`
-                set the content of PropertyValue to property PropertyName of Block
+                set the text of PropertyValue to property PropertyName of Block
                 add 1 to N
             end
             create Row in Editor
@@ -185,17 +150,14 @@ Restart:
         else
         begin
         	gosub to SaveSelectedBlock
-        	set the text of EditButton to `Edit`
             clear Editor
             set style `display` of Editor to `none`
         end
     end
     on click DeleteBlock
     begin
     	put the index of DeleteBlock into N
-        put element N of BlockNames into BlockName
-        put property `blocks` of Presentation into Blocks
-        json delete property BlockName of Blocks
+        json delete element N of Blocks
         set property `blocks` of Presentation to Blocks
         go to Restart
     end
@@ -204,24 +166,16 @@ Restart:
 !	Save the seleced block
 SaveSelectedBlock:
 	if SelectedBlock is -1 return
+    put element SelectedBlock of Blocks into Block
 	put 0 into N
     while N is less than the json count of PropertyNames
     begin
         put element N of PropertyNames into PropertyName
     	index PropertyValue to N
-        set property PropertyName of Block to PropertyValue
+        set property PropertyName of Block to the text of PropertyValue
     	add 1 to N
     end
-    index BlockNameInput to SelectedBlock
-    put element SelectedBlock of BlockNames into BlockName
-    if BlockNameInput is not BlockName
-    begin
-print `deleting`
-    	json delete property BlockName of Blocks
-        put BlockNameInput into BlockName
-        set element SelectedBlock of BlockNames to BlockName
-    end
-    set property BlockName of Blocks to Block
+    set element SelectedBlock of Blocks to Block
     set property `blocks` of Presentation to Blocks
 
 !	Tell the parent to refresh the script
diff --git a/iwsy/resources/ecs/iwsy.txt b/iwsy/resources/ecs/iwsy.txt
@@ -346,10 +346,10 @@ L2:
 CreateNewPresentation:
     set Presentation to object
     set Item to object
-    set property `blocks` of Presentation to Item
     set property `content` of Presentation to Item
     set Item to array
     set property `steps` of Presentation to Item
+    set property `blocks` of Presentation to Item
 	return
 
 SetupSteps:
diff --git a/iwsy/resources/ecs/steps.txt b/iwsy/resources/ecs/steps.txt
@@ -304,7 +304,14 @@ CreateNewStep:
 EditStep:
 	put property `blocks` of Presentation into Blocks
     put property `content` of Presentation into Contents
-    put the json keys of Blocks into BlockNames
+    set BlockNames to array
+    put 0 into N
+    while N is less than the json count of Blocks
+    begin
+    	put element N of Blocks into Block
+        json add property `name` of Block to BlockNames
+    	add 1 to N
+    end
     put the json keys of Contents into ContentNames
     put element SelectedStep of Steps into CurrentStep
 
