Merge pull request #97 from easycoder/dev

Prepare for 'show block'

Author: easycoder

dist/plugins/iwsy.js

@@ -59,6 +59,16 @@ const EasyCoder_IWSY = {
 						target
 					});
 					return true;
+				case `block`:
+					const block = compiler.getNextValue();
+					compiler.addCommand({
+						domain: `iwsy`,
+						keyword: `iwsy`,
+						lino,
+						action,
+						block
+					});
+					return true;
 				case `run`:
 					const pc = compiler.getPc();
 					compiler.next();
@@ -148,6 +158,8 @@ const EasyCoder_IWSY = {
 						EasyCoder.iwsyFunctions.gotoStep(program.getValue(command.target));
 					}
 					break;
+				case `block`:
+					break;
 				case `run`:
 					if (EasyCoder.iwsyFunctions) {
 						EasyCoder.iwsyFunctions.run(function() {

iwsy/resources/ecs/blocks.txt

@@ -9,14 +9,18 @@
     div Table
     div Row
     div Cell
+    div Empty
     input PropertyValue
     button EditButton
     button SaveButton
+    img ShowBlock
     img AddBlock
+    img Up
     img DeleteBlock
     a Link
     variable Blocks
     variable Block
+    variable Block2
     variable PropertyDefaults
     variable PropertyNames
     variable PropertyName
@@ -73,25 +77,45 @@ Restart:
     end
 
 	put the json count of Blocks into NBlocks
+    set the elements of ShowBlock to 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 Up to NBlocks
     set the elements of DeleteBlock to NBlocks
     create Table in Panel
     set the style of Table to `width:100%`
     put 0 into N
     while N is less than NBlocks
     begin
         index EditButton to N
+        index Up 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:100%;display:flex`
+        create Link in Cell
+    	index ShowBlock to N
+        create ShowBlock in Link
+        set the style of ShowBlock to `width:1em;margin:0.1em 0.2em 0 0`
+        set attribute `src` of ShowBlock to `resources/icon/binoculars.png`
         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
+        if N is 0
+        begin
+            create Empty in Cell
+            set the style of Empty to `width:1em;margin:0.2em 0 0 0.2em`
+        end
+        else
+        begin
+            create Link in Cell
+            create Up in Link
+            set the style of Up to `width:1em;margin:0.2em 0 0 0.2em`
+            set attribute `src` of Up to `/resources/icon/up.png`
+        end
         create Link in Cell
         create DeleteBlock in Link
         set the style of DeleteBlock to `width:1em;margin:0.2em 0 0 0.2em`
@@ -100,6 +124,13 @@ Restart:
         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 ShowBlock
+    begin
+    	set Message to object
+        set property `action` of Message to `block`
+        set property `block` of Message to the index of ShowBlock
+        send Message to parent
+    end
     on click EditButton
     begin
         put the index of EditButton into SavedIndex
@@ -155,6 +186,18 @@ Restart:
             set style `display` of Editor to `none`
         end
     end
+    on click Up
+    begin
+    	put the index of Up into N
+        put element N of Blocks into Block
+        take 1 from N
+        put element N of Blocks into Block2
+        set element N of Blocks to Block
+        add 1 to N
+        set element N of Blocks to Block2
+        set property `blocks` of Presentation to Blocks
+        go to Restart
+    end
     on click DeleteBlock
     begin
     	put the index of DeleteBlock into N

iwsy/resources/ecs/content.txt

@@ -9,15 +9,18 @@
     div Table
     div Row
     div Cell
+    div Empty
     input ItemNameInput
     textarea TextArea
     button EditButton
     button SaveButton
     img AddItem
+    img Up
     img DeleteItem
     a Link
     variable Items
     variable Item
+    variable Item2
     variable ItemNames
     variable ItemName
     variable SelectedItem
@@ -77,6 +80,7 @@ Restart:
     set the elements of EditButton to NumItems
     set the elements of Editor to NumItems
     set the elements of SaveButton to NumItems
+    set the elements of Up to NumItems
     set the elements of DeleteItem to NumItems
     set the elements of ItemNameInput to NumItems
     set the elements of TextArea to NumItems
@@ -86,6 +90,7 @@ Restart:
     while N is less than the elements of EditButton
     begin
         index EditButton to N
+        index Up to N
         index DeleteItem to N
         index Editor to N
         index ItemNameInput to N
@@ -97,6 +102,18 @@ Restart:
         create EditButton in Cell
         set the style of EditButton to `flex:1`
         set the text of EditButton to ItemName
+        if N is 0
+        begin
+            create Empty in Cell
+            set the style of Empty to `width:1em;margin:0.2em 0 0 0.2em`
+        end
+        else
+        begin
+            create Link in Cell
+            create Up in Link
+            set the style of Up to `width:1em;margin:0.2em 0 0 0.2em`
+            set attribute `src` of Up to `/resources/icon/up.png`
+        end
         create Link in Cell
         create DeleteItem in Link
         set the style of DeleteItem to `width:1em;margin:0.2em 0 0 0.2em`
@@ -157,6 +174,18 @@ Restart:
             set style `display` of Editor to `none`
         end
     end
+    on click Up
+    begin
+    	put the index of Up into N
+        put element N of Items into Item
+        take 1 from N
+        put element N of Items into Item2
+        set element N of Items to Item
+        add 1 to N
+        set element N of Items to Item2
+        set property `content` of Presentation to Items
+        go to Restart
+    end
     on click DeleteItem
     begin
     	put the index of DeleteItem into N

iwsy/resources/ecs/iwsy.txt

@@ -340,6 +340,12 @@ L2:
             else if Section is 1 set style `display` of BlocksPanel to `block`
             else if Section is 2 set style `display` of ContentPanel to `block`
         end
+        else if Action is `block`
+        begin
+        	put property `block` of Message into N
+        alert `Show block ` cat N
+            iwsy block N
+        end
     end
 	stop
 

iwsy/resources/icon/up.png

@@ -37,25 +37,25 @@
       "width": "100%"
     },
     {
-      "name": "main content",
-      "background": "",
-      "border": "",
+      "name": "left",
+      "background": "rgba(80,80,80,0.5)",
+      "border": "1px solid gray",
       "borderRadius": "",
       "fontColor": "yellow",
       "fontFamily": "",
       "fontSize": 50,
       "fontStyle": "",
       "fontWeight": "",
-      "height": 800,
+      "height": 700,
       "left": 50,
       "textAlign": "",
-      "textMarginLeft": 10,
-      "textMarginTop": "",
-      "top": 300,
-      "width": "100%"
+      "textMarginLeft": 20,
+      "textMarginTop": 20,
+      "top": 250,
+      "width": 400
     },
     {
-      "name": "left",
+      "name": "right",
       "background": "rgba(80,80,80,0.5)",
       "border": "1px solid gray",
       "borderRadius": "",
@@ -64,31 +64,31 @@
       "fontSize": 50,
       "fontStyle": "",
       "fontWeight": "",
-      "height": 650,
-      "left": 50,
+      "height": 700,
+      "left": 550,
       "textAlign": "",
       "textMarginLeft": 20,
       "textMarginTop": 20,
-      "top": 300,
+      "top": 250,
       "width": 400
     },
     {
-      "name": "right",
-      "background": "rgba(80,80,80,0.5)",
-      "border": "1px solid gray",
+      "name": "main content",
+      "background": "",
+      "border": "",
       "borderRadius": "",
       "fontColor": "yellow",
       "fontFamily": "",
       "fontSize": 50,
       "fontStyle": "",
       "fontWeight": "",
-      "height": 650,
-      "left": 550,
+      "height": 800,
+      "left": 50,
       "textAlign": "",
-      "textMarginLeft": 20,
-      "textMarginTop": 20,
+      "textMarginLeft": 10,
+      "textMarginTop": "",
       "top": 300,
-      "width": 400
+      "width": "100%"
     }
   ],
   "content": [
@@ -98,11 +98,11 @@
     },
     {
       "name": "page 1 left",
-      "content": "### PowerPoint%0a%0a - is slide-based%0a - is a PC application%0a - is hard to embed%0a%0aPowerPoint is a dated product organized mainly around static text blocks and tied to the desktop."
+      "content": "### PowerPoint%0a%0a - is slide-based%0a - is a PC application%0a - is hard to embed%0a%0aPowerPoint is organized mainly around static text blocks and tied to the desktop."
     },
     {
       "name": "page 1 right",
-      "content": "### I Wanna Show You%0a - is step based%0a - runs in your browser%0a - is fully embeddable%0a%0aIWannaShowYou is a modern product built to handle color, movement and a mobile environment."
+      "content": "### I Wanna Show You%0a - is step based%0a - runs in your browser%0a - is fully embeddable%0a%0aIWannaShowYou is built to handle color, movement and the online environment."
     }
   ],
   "steps": [

iwsy/resources/json/test.json

@@ -59,6 +59,16 @@ const EasyCoder_IWSY = {
 						target
 					});
 					return true;
+				case `block`:
+					const block = compiler.getNextValue();
+					compiler.addCommand({
+						domain: `iwsy`,
+						keyword: `iwsy`,
+						lino,
+						action,
+						block
+					});
+					return true;
 				case `run`:
 					const pc = compiler.getPc();
 					compiler.next();
@@ -148,6 +158,8 @@ const EasyCoder_IWSY = {
 						EasyCoder.iwsyFunctions.gotoStep(program.getValue(command.target));
 					}
 					break;
+				case `block`:
+					break;
 				case `run`:
 					if (EasyCoder.iwsyFunctions) {
 						EasyCoder.iwsyFunctions.run(function() {