From e6066a4db339f3fb72e090c910374f819851694d Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Fri, 18 May 2012 05:15:36 +0200
Subject: [PATCH] Fix #486

---
 4chan_x.user.js | 16 ++++++++--------
 script.coffee   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 2e09511af..dd992f7a4 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2257,7 +2257,7 @@
         });
         for (key in obj) {
           arr = obj[key];
-          checked = Conf[key] ? 'checked' : '';
+          checked = $.get(key, Conf[key]) ? 'checked' : '';
           description = arr[1];
           li = $.el('li', {
             innerHTML: "<label><input type=checkbox name=\"" + key + "\" " + checked + ">" + key + "</label><span class=description>: " + description + "</span>"
@@ -2277,12 +2277,12 @@
       _ref1 = $$('textarea', dialog);
       for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
         ta = _ref1[_i];
-        ta.textContent = Conf[ta.name];
+        ta.textContent = $.get(ta.name, Conf[ta.name]);
         $.on(ta, 'change', $.cb.value);
       }
-      (back = $('[name=backlink]', dialog)).value = Conf['backlink'];
-      (time = $('[name=time]', dialog)).value = Conf['time'];
-      (fileInfo = $('[name=fileInfo]', dialog)).value = Conf['fileInfo'];
+      (back = $('[name=backlink]', dialog)).value = $.get('backlink', Conf['backlink']);
+      (time = $('[name=time]', dialog)).value = $.get('time', Conf['time']);
+      (fileInfo = $('[name=fileInfo]', dialog)).value = $.get('fileInfo', Conf['fileInfo']);
       $.on(back, 'keyup', $.cb.value);
       $.on(back, 'keyup', Options.backlink);
       $.on(time, 'keyup', $.cb.value);
@@ -2290,7 +2290,7 @@
       $.on(fileInfo, 'keyup', $.cb.value);
       $.on(fileInfo, 'keyup', Options.fileInfo);
       favicon = $('select', dialog);
-      favicon.value = Conf['favicon'];
+      favicon.value = $.get('favicon', Conf['favicon']);
       $.on(favicon, 'change', $.cb.value);
       $.on(favicon, 'change', Options.favicon);
       _ref2 = Config.hotkeys;
@@ -2300,7 +2300,7 @@
           innerHTML: "<td>" + arr[1] + "</td><td><input name=" + key + "></td>"
         });
         input = $('input', tr);
-        input.value = Conf[key];
+        input.value = $.get(key, Conf[key]);
         $.on(input, 'keydown', Options.keybind);
         $.add($('#keybinds_tab + div tbody', dialog), tr);
       }
@@ -2309,7 +2309,7 @@
       for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
         indicator = _ref3[_j];
         key = indicator.firstChild.textContent;
-        indicator.hidden = Conf[key];
+        indicator.hidden = $.get(key, Conf[key]);
         indicators[key] = indicator;
         $.on($("[name='" + key + "']", dialog), 'click', function() {
           return indicators[this.name].hidden = this.checked;
diff --git a/script.coffee b/script.coffee
index 2daf72948..32737f029 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1750,7 +1750,7 @@ Options =
       ul = $.el 'ul',
         textContent: key
       for key, arr of obj
-        checked = if Conf[key] then 'checked' else ''
+        checked = if $.get(key, Conf[key]) then 'checked' else ''
         description = arr[1]
         li = $.el 'li',
           innerHTML: "<label><input type=checkbox name=\"#{key}\" #{checked}>#{key}</label><span class=description>: #{description}</span>"
@@ -1767,13 +1767,13 @@ Options =
 
     #filter & sauce
     for ta in $$ 'textarea', dialog
-      ta.textContent = Conf[ta.name]
+      ta.textContent = $.get ta.name, Conf[ta.name]
       $.on ta, 'change', $.cb.value
 
     #rice
-    (back         = $ '[name=backlink]', dialog).value = Conf['backlink']
-    (time         = $ '[name=time]',     dialog).value = Conf['time']
-    (fileInfo     = $ '[name=fileInfo]', dialog).value = Conf['fileInfo']
+    (back     = $ '[name=backlink]', dialog).value = $.get 'backlink', Conf['backlink']
+    (time     = $ '[name=time]',     dialog).value = $.get 'time',     Conf['time']
+    (fileInfo = $ '[name=fileInfo]', dialog).value = $.get 'fileInfo', Conf['fileInfo']
     $.on back, 'keyup', $.cb.value
     $.on back, 'keyup', Options.backlink
     $.on time, 'keyup', $.cb.value
@@ -1781,7 +1781,7 @@ Options =
     $.on fileInfo, 'keyup', $.cb.value
     $.on fileInfo, 'keyup', Options.fileInfo
     favicon = $ 'select', dialog
-    favicon.value = Conf['favicon']
+    favicon.value = $.get 'favicon', Conf['favicon']
     $.on favicon, 'change', $.cb.value
     $.on favicon, 'change', Options.favicon
 
@@ -1790,7 +1790,7 @@ Options =
       tr = $.el 'tr',
         innerHTML: "<td>#{arr[1]}</td><td><input name=#{key}></td>"
       input = $ 'input', tr
-      input.value = Conf[key]
+      input.value = $.get key, Conf[key]
       $.on input, 'keydown', Options.keybind
       $.add $('#keybinds_tab + div tbody', dialog), tr
 
@@ -1798,7 +1798,7 @@ Options =
     indicators = {}
     for indicator in $$ '.warning', dialog
       key = indicator.firstChild.textContent
-      indicator.hidden = Conf[key]
+      indicator.hidden = $.get key, Conf[key]
       indicators[key] = indicator
       $.on $("[name='#{key}']", dialog), 'click', ->
         indicators[@name].hidden = @checked