⏰🔀 Updated in browser at strd6.github.io/editor

Author: STRd6

actions.coffee.md

@@ -179,8 +179,18 @@ Actions
                   editor.resize({width, height})
                   editor.vintageReplay(data)
               else
-                # New replays should handle resizing and intial state themselves
-                editor.replay(data)
+                editor.restoreState data, true
+      
+      "f7":
+        name: "Load local"
+        description: "Load local file as replay"
+        method: ({editor}) ->
+          Modal.show FileReading.readerInput
+            accept: "application/json"
+            json: (data) ->
+              editor.restoreState data, true
+            chose: ->
+              Modal.hide()
 
       "ctrl+shift+s":
         name: "Save State"

command.coffee.md

@@ -7,6 +7,9 @@ Command
 Commands that can be done/undone in the editor.
 
     module.exports = (I={}, self) ->
+      self.imageDataToJSON = imageDataToJSON
+      self.imageDataFromJSON = imageDataFromJSON
+
       self.Command = {}
 
 This is a weird DSL for each command to inherit a toJSON method and to register

editor.coffee.md

@@ -47,7 +47,7 @@ Editor
       lastCommand = null
 
       replaying = false
-      initialSize = pixelExtent()
+      initialState = null
 
       self ?= Model(I)
 
@@ -178,24 +178,35 @@ Editor
 
             setTimeout runStep, delay
 
-        restoreState: (state) ->
+        restoreState: (state, performReplay=false) ->
           self.palette state.palette.map Observable
 
+          initialState = self.imageDataFromJSON(state.initialState)
+          self.restoreInitialState()
+
           commands = state.history.map self.Command.parse
-          commands.forEach (command) -> command.execute()
-          self.history commands
 
-          self.repaint()
+          if performReplay
+            self.replay commands
+          else
+            commands.forEach (command) -> command.execute()
+            self.history commands
+
+            self.repaint()
 
         saveState: ->
-          # TODO: Need to add our initial state to the json
-          self.Command.Resize
-            size: initialSize
-            sizePrevious: initialSize
-            imageData: self.getSnapshot()
-        
+          version: "1"
           palette: self.palette().map (o) -> o()
           history: self.history().invoke "toJSON"
+          initialState: self.imageDataToJSON initialState
+
+        setInitialState: (imageData) ->
+          initialState = imageData
+
+        restoreInitialState: ->
+          # Become the image with no history
+          self.resize initialState, initialState
+          self.history([])
 
         withCanvasMods: (cb) ->
           canvas.context().globalAlpha = thumbnailCanvas.context().globalAlpha = self.alpha() / 100
@@ -459,4 +470,6 @@ Editor
 
       # self.include require("./plugins/save_to_s3")
 
+      initialState = self.getSnapshot()
+
       return self