From bae7552cdaedeb48ddbb83a11e7e7422cd7bdbfb Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 8 Mar 2013 11:30:34 +0100
Subject: [PATCH] Improved @delay and @interval, use globale storage.

---
 .../_application_controller.js.coffee         | 44 ++++++++-----------
 .../app/lib/app_init/config.js.coffee         |  1 +
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
index 6d06a229c..b6ea70701 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
@@ -204,53 +204,47 @@ class App.Controller extends Spine.Controller
 
 
   clearDelay: (delay_id) =>
-    # check global var
-    if !@_delayID
-      @_delayID = {}
-    clearTimeout( @_delayID[delay_id] ) if @_delayID[delay_id]
+
+    # get global delay ids
+    current = @Config.get( delay_id, '_delayID' )
+    return if !current
+    clearTimeout( current )
 
   delay: (callback, timeout, delay_id) =>
 
-    # clear auto save
-    @clearDelay( delay_id )
-
     # request new data
     call = =>
       callback()
     if delay_id
 
-      # check global var
-      if !@_delayID
-        @_delayID = {}
+      # clear current delay_id
+      @clearDelay( delay_id )
 
-      @_delayID[delay_id] = setTimeout( call, timeout )
+      new_id = setTimeout( call, timeout )
+      @Config.set( delay_id, new_id, '_delayID' )
     else
       setTimeout( call, timeout )
 
   clearInterval: (interval_id) =>
-    # check global var
-    if !@_intervalID
-      @_intervalID = {}
 
-    clearInterval( @_intervalID[interval_id] ) if @_intervalID[interval_id]
+    # get global interval ids
+    current = @Config.get( interval_id, '_intervalID' )
+    return if !current
+    clearInterval( current )
 
   interval: (callback, interval, interval_id) =>
 
-    # check global var
-    if !@_intervalID
-      @_intervalID = {}
+    # clear current interval
+    @clearInterval( interval_id )
 
     callback()
 
-    # auto save
-    every = (ms, cb) -> setInterval cb, ms
-
-    # clear auto save
-    @clearInterval( @_intervalID[interval_id] )
+    every = (ms, cb) =>
+      setInterval cb, ms
 
     # request new data
-    @_intervalID[interval_id] = every interval, () =>
-      callback()
+    new_id = every( interval, callback )
+    @Config.set( interval_id, new_id, '_intervalID' )
 
   userPopups: (position = 'right') ->
 
diff --git a/app/assets/javascripts/app/lib/app_init/config.js.coffee b/app/assets/javascripts/app/lib/app_init/config.js.coffee
index a5e8a074f..6717f13df 100644
--- a/app/assets/javascripts/app/lib/app_init/config.js.coffee
+++ b/app/assets/javascripts/app/lib/app_init/config.js.coffee
@@ -26,6 +26,7 @@ class _Singleton
   get: ( key, group ) ->
     if group
       return undefined if !group of @config
+      return undefined if @config[group] is undefined
       return @config[group][key]
     return @config[key]