From 5a9eac7cc637e6dfe703bb287e925643a9e41e4e Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 14 May 2016 19:41:31 -0700
Subject: [PATCH] Simplify Advanced Settings code.

---
 src/General/Settings.coffee | 41 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index c531df2eb..ee7b20821 100644
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -425,39 +425,29 @@ Settings =
     $.extend section, <%= readHTML('Advanced.html') %>
     warning.hidden = Conf[warning.dataset.feature] for warning in $$ '.warning', section
 
-    items = {}
     inputs = {}
-    for name in ['captchaLanguage', 'boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss', 'customCooldown']
-      input = $ "[name='#{name}']", section
-      items[name]  = Conf[name]
-      inputs[name] = input
-      if name is 'usercss'
-        $.on input, 'change', $.cb.value
-      else if name is 'favicon'
-        $.on input, 'change', $.cb.value
-        $.on input, 'change', Settings[name]
-      else
-        $.on input, 'input', $.cb.value
-        $.on input, 'input', Settings[name] if name of Settings
+    for input in $$ '[name]', section
+      inputs[input.name] = input
 
-    # Quick Reply Personas
-    ta = $ '.personafield', section
-
-    $.get 'QR.personas', Conf['QR.personas'], (item) ->
-      ta.value = item['QR.personas']
-    $.on ta, 'change', $.cb.value
+    items = {}
+    for name in ['captchaLanguage', 'boardnav', 'time', 'backlink', 'fileInfo', 'QR.personas', 'favicon', 'usercss', 'customCooldown']
+      items[name] = Conf[name]
+      input = inputs[name]
+      event = if name in ['QR.personas', 'favicon', 'usercss'] then 'change' else 'input'
+      $.on input, event, $.cb.value
+      $.on input, event, Settings[name] if name of Settings
 
     $.get items, (items) ->
       for key, val of items
         input = inputs[key]
         input.value = val
-        if key of Settings and key isnt 'usercss'
+        if key of Settings
           Settings[key].call input
       return
 
-    interval  = $ 'input[name="Interval"]',   section
-    customCSS = $ 'input[name="Custom CSS"]', section
-    applyCSS  = $ '#apply-css',               section
+    interval  = inputs['Interval']
+    customCSS = inputs['Custom CSS']
+    applyCSS  = $ '#apply-css', section
 
     interval.value             =  Conf['Interval']
     customCSS.checked          =  Conf['Custom CSS']
@@ -466,7 +456,7 @@ Settings =
 
     $.on interval,  'change', ThreadUpdater.cb.interval
     $.on customCSS, 'change', Settings.togglecss
-    $.on applyCSS,  'click',  Settings.usercss
+    $.on applyCSS,  'click',  -> CustomCSS.update()
 
     archBoards = {}
     for {uid, name, boards, files, software, withCredentials} in Redirect.archives
@@ -595,9 +585,6 @@ Settings =
       CustomCSS.addStyle()
     $.cb.checked.call @
 
-  usercss: ->
-    CustomCSS.update()
-
   keybinds: (section) ->
     $.extend section, <%= readHTML('Keybinds.html') %>
     $('.warning', section).hidden = Conf['Keybinds']