From 3dfa1cfdcc0ec5f4859bf565acbf81c0ddba0db4 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 20 Dec 2014 16:23:49 -0800
Subject: [PATCH] FappeTyme refactoring.

---
 src/Images/FappeTyme.coffee       | 22 ++++++++++------------
 src/Miscellaneous/Keybinds.coffee |  4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/Images/FappeTyme.coffee b/src/Images/FappeTyme.coffee
index a7c8c59df..c864b1d09 100755
--- a/src/Images/FappeTyme.coffee
+++ b/src/Images/FappeTyme.coffee
@@ -2,6 +2,7 @@ FappeTyme =
   init: ->
     return if !(Conf['Fappe Tyme'] or Conf['Werk Tyme']) or g.VIEW is 'catalog' or g.BOARD is 'f'
 
+    @nodes = {}
     @enabled =
       fappe: false
       werk:  Conf['werk']
@@ -11,15 +12,14 @@ FappeTyme =
       el = UI.checkbox lc, " #{type} Tyme", false
       el.title = "#{type} Tyme"
 
-      FappeTyme[lc] = input = el.firstElementChild
-      $.on input, 'change', FappeTyme.cb.toggle.bind input
+      @nodes[lc] = el.firstElementChild
+      @set lc, true if Conf[lc]
+      $.on @nodes[lc], 'change', @toggle.bind(@, lc)
 
       Header.menu.addEntry
         el:    el
         order: 97
 
-      FappeTyme.cb.set lc if Conf[lc]
-
     Post.callbacks.push
       name: 'Fappe Tyme'
       cb:   @node
@@ -40,12 +40,10 @@ FappeTyme =
       className:   'werkTyme-filename'
     $.add @nodes.thumb.parentNode, filename
 
-  cb:
-    set: (type) ->
-      FappeTyme[type].checked = FappeTyme.enabled[type]
-      $["#{if FappeTyme.enabled[type] then 'add' else 'rm'}Class"] doc, "#{type}Tyme"
+  set: (type, enabled) ->
+    @enabled[type] = @nodes[type].checked = enabled
+    $["#{if enabled then 'add' else 'rm'}Class"] doc, "#{type}Tyme"
 
-    toggle: ->
-      FappeTyme.enabled[@name] = !FappeTyme.enabled[@name]
-      FappeTyme.cb.set @name
-      $.cb.checked.call FappeTyme[@name] if @name is 'werk'
+  toggle: (type) ->
+    @set type, !@enabled[type]
+    $.cb.checked.call @nodes[type] if type is 'werk'
diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index a4c541bab..6f93f2c67 100755
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -97,10 +97,10 @@ Keybinds =
         Gallery.cb.toggle()
       when Conf['fappeTyme']
         return if !Conf['Fappe Tyme'] or g.VIEW is 'catalog' or g.BOARD is 'f'
-        FappeTyme.cb.toggle.call {name: 'fappe'}
+        FappeTyme.toggle 'fappe'
       when Conf['werkTyme']
         return if !Conf['Werk Tyme'] or g.VIEW is 'catalog' or g.BOARD is 'f'
-        FappeTyme.cb.toggle.call {name: 'werk'}
+        FappeTyme.toggle 'werk'
       # Board Navigation
       when Conf['Front page']
         if Conf['JSON Navigation'] and !Conf['Use 4chan X Catalog'] and g.VIEW is 'index'