Merge pull request #88 from easycoder/dev

Small bug fixes

Author: easycoder

iwsy/iwsy.js

@@ -659,7 +659,7 @@ const IWSY = (container, text) => {
                 throw Error(`Unknown action: '${step.action}'`);
             }
         }
-        if (script.onStepCB) {
+        if (script.onStepCB && script.runMode === `auto`) {
             script.onStepCB(step.index);
         }
         handler(step);

iwsy/resources/ecs/iwsy.txt

@@ -267,7 +267,12 @@ L2:
         if Name is not CurrentScriptName put empty into LastSavedState
         if Presentation is not LastSavedState
         begin
-            if PasswordValid rest post Presentation to `_save/json/` cat Name
+            if PasswordValid
+            begin
+            	put Presentation into Content
+                json format Content
+                rest post Content to `_save/json/` cat Name
+            end
             else put Presentation into storage as Name
             put Presentation into LastSavedState
             gosub to SetStatusGreen
@@ -322,7 +327,10 @@ L2:
     begin
     	put the message into Message
         put property `action` of Message into Action
-        if Action is `goto` iwsy goto property `index` of Message
+        if Action is `goto`
+        begin
+        	if not Running iwsy goto property `index` of Message
+        end
         else if Action is `refresh`
         begin
         	iwsy script Presentation
@@ -548,6 +556,7 @@ DoRunStop:
     else
     begin
     	set Running
+		gosub to ClearStepsButtons
     	put property `steps` of Presentation into Item
     	if the json count of Item is  0 stop
         set attribute `src` of RunStop to `resources/icon/runstop.png`
@@ -558,6 +567,9 @@ DoRunStop:
             set property `action` of Message to `step`
             set property `step` of Message to the step
             send Message to StepsModule
+            set Message to object
+            set property `action` of Message to `running`
+            send Message to StepsModule
         end
 
         iwsy run then

iwsy/resources/ecs/steps.txt

@@ -60,6 +60,7 @@
     variable TrueFalse
     variable Response
     variable Message
+    variable Running
     variable N
     variable B
 
@@ -87,6 +88,7 @@ Start:
     end
     if property `action` of Message is `clear`
     begin
+    	clear Running
     	put 0 into N
         while N is less than the elements of StepButton
         begin
@@ -96,6 +98,11 @@ Start:
     	end
         stop
     end
+    if property `action` of Message is `running`
+    begin
+    	set Running
+    	stop
+    end
     if property `action` of Message is `step`
     begin
     	put property `step` of Message into N
@@ -207,6 +214,7 @@ Restart:
     end
     on click ShowStep
     begin
+    	if Running stop
     	put 0 into N
         while N is less than the json count of Steps
         begin
@@ -247,6 +255,7 @@ Restart:
     json add `false` to ContinueTypes
 
     put property `steps` of Presentation into Steps
+    clear Running
 
     stop