Moved nowThreshold and timestampRefreshInterval to kandan_settings.ym…

…l for consistency.
kandanapp · Mar 14, 2013 · d4a857f · d4a857f
1 parent d92fb81
commit d4a857f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee
@@ -17,12 +17,7 @@ window.Kandan =
   Plugins:      {}
 
   options: ->
-    unless @_options?
-      @_options = $('body').data('kandan-config')
-      @_options.nowThreshold = 3000
-      @_options.timestampRefreshInterval = 2000
-    return @_options
-
+    @_options ?= $('body').data('kandan-config')
 
   # TODO this is a helper method to register plugins
   # in the order required until we come up with plugin management
@@ -133,8 +128,8 @@ window.Kandan =
   registerUtilityEvents: ()->
     window.setInterval(=>
       for el in $(".posted_at")
-        $(el).text (new Date($(el).data("timestamp"))).toRelativeTime(@options().nowThreshold)
-    , @options().timestampRefreshInterval)
+        $(el).text (new Date($(el).data("timestamp"))).toRelativeTime(@options().now_threshold)
+    , @options().timestamp_refresh_interval)
 
   init: ->
     channels = new Kandan.Collections.Channels()

diff --git a/app/assets/templates/activity_base.jst.eco b/app/assets/templates/activity_base.jst.eco
@@ -1,5 +1,5 @@
 <span class="posted_at">
-  <%= new Date(@activity.created_at).toRelativeTime(Kandan.options().nowThreshold) %>
+  <%= new Date(@activity.created_at).toRelativeTime(Kandan.options().now_threshold) %>
 </span>
 <img class="avatar" src="<%= @activity.avatarUrl %>"/>
 

diff --git a/app/assets/templates/message.jst.eco b/app/assets/templates/message.jst.eco
@@ -1,5 +1,5 @@
 <span class="posted_at">
-  <%= new Date(@activity.created_at).toRelativeTime(Kandan.options().nowThreshold) %>
+  <%= new Date(@activity.created_at).toRelativeTime(Kandan.options().now_threshold) %>
 </span>
 <img class="avatar" src="<%= @activity.avatarUrl %>"/>
 

diff --git a/app/assets/templates/user_notification.jst.eco b/app/assets/templates/user_notification.jst.eco
@@ -1,5 +1,5 @@
 <span class="posted_at">
-  <%= new Date(@activity.created_at).toRelativeTime(Kandan.options().nowThreshold) %>
+  <%= new Date(@activity.created_at).toRelativeTime(Kandan.options().now_threshold) %>
 </span>
 <img class="avatar" src="<%= @activity.avatarUrl %>"/>
 

diff --git a/config/kandan_settings.yml b/config/kandan_settings.yml
@@ -16,3 +16,6 @@
 
 :avatar_url: http://gravatar.com/avatar/%{hash}?s=%{size}&d=%{fallback}
 :avatar_fallback: identicon
+
+:now_threshold: 3000
+:timestamp_refresh_interval: 2000