Merge branch 'upgrade_dashing'

1 files changed, 7 insertions, 1 deletions

diff --git a/javascripts/dashing.coffee b/javascripts/dashing.coffee
index 20a9987..58218ae 100644
--- a/javascripts/dashing.coffee
+++ b/javascripts/dashing.coffee
@@ -46,7 +46,7 @@ class Dashing.Widget extends Batman.View
 
   @accessor 'updatedAtMessage', ->
     if updatedAt = @get('updatedAt')
-      timestamp = new Date(updatedAt * 1000)
+      timestamp = new Date(updatedAt)
       hours = timestamp.getHours()
       minutes = ("0" + timestamp.getMinutes()).slice(-2)
       "Last updated at #{hours}:#{minutes}"
@@ -57,16 +57,22 @@ class Dashing.Widget extends Batman.View
     # In case the events from the server came before the widget was rendered
     lastData = Dashing.lastEvents[@id]
     if lastData
+      lastData = @select(lastData)
       @mixin(lastData)
       @onData(lastData)
 
   receiveData: (data) =>
+    data = @select(data)
     @mixin(data)
     @onData(data)
 
   onData: (data) =>
     # Widgets override this to handle incoming data
 
+  select: (data) =>
+    # Widgets override this to transform data before it is applied to the model
+    return data
+
 Dashing.AnimatedValue =
   get: Batman.Property.defaultAccessor.get
   set: (k, to) ->