Diff marker; Numerous bugs fixed

evilmartians · Jan 27, 2013 · a5b35e6 · a5b35e6
1 parent 6e1ff7d
commit a5b35e6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/lib/foundry-xray/app/assets/javascripts/application.js.coffee b/lib/foundry-xray/app/assets/javascripts/application.js.coffee
@@ -23,6 +23,7 @@ class Application
     @title     = $('#title')
     @transform = $('#transform')
     @selector  = $('#functions select')
+    @diff      = $('#diff')
 
     @zoomButton = $('#zoom button')
 
@@ -61,6 +62,7 @@ class Application
       @timeline.show()
       @title.removeClass('error')
       @transform.removeClass('active').html('')
+      @diff.html('')
 
       input = @data[@currentFunction]
 
@@ -72,6 +74,7 @@ class Application
       @drawer = new Drawer(new Graph(@input))
 
       @title.html @input.function.title()
+      @diff.html "~ " + @input.previousState.cursor if @input.previousState?.cursor?
 
       @renewZoomer()
       @renewSelector()

diff --git a/lib/foundry-xray/app/assets/javascripts/lib/input.js.coffee b/lib/foundry-xray/app/assets/javascripts/lib/input.js.coffee
@@ -37,7 +37,6 @@ class @Input
       x.id < @events.length-1
 
     @reset()
-    @skipState = true
 
   reset: ->
     @types           = Object.extended()
@@ -54,9 +53,14 @@ class @Input
 
   rewind: (to) ->
     return if to == @cursor
-    @previousState = new InputState(@) unless @skipState
-    @skipState = false
-    @reset() if to < @cursor
+
+    if to < @cursor
+      delete @previousState
+      @reset()
+    else
+      @previousState = new InputState(@)
+
+    @reset() 
     @increment(to)
 
   increment: (to) ->

diff --git a/lib/foundry-xray/app/assets/javascripts/lib/input_state.js.coffee b/lib/foundry-xray/app/assets/javascripts/lib/input_state.js.coffee
@@ -1,6 +1,7 @@
 class @InputState
   constructor: (input) ->
     @blocks = Object.extended()
+    @cursor = input.cursor
 
     input.blocksMap.each (bname, id) =>
       @blocks[bname] = input.blocks[id].instructions.map (x) ->

diff --git a/lib/foundry-xray/app/assets/stylesheets/app.css.sass b/lib/foundry-xray/app/assets/stylesheets/app.css.sass
@@ -145,8 +145,14 @@ html
             border-radius: 5px
             border: 1px solid #aaaaaa
 
+          #diff
+            font-size: 10px
+            display: block
+            text-align: center
+            margin-top: 2px
+
           .slider
-            margin-top: 20px
+            margin-top: 10px
             margin-left: 6px
             margin-bottom: 20px
             width: 40px

diff --git a/lib/foundry-xray/app/views/index.haml b/lib/foundry-xray/app/views/index.haml
@@ -35,6 +35,7 @@
             %button.next
               &uarr;
             %input{:type => 'text', :size => 3, :value => 0}
+            %span#diff
             .slider
               #transforms
             %button.prev