From ccc090e20c1dd71474ab979122d41e158e0cbd5d Mon Sep 17 00:00:00 2001
From: Jordan Bates <saudrapsmann@gmail.com>
Date: Fri, 26 Apr 2013 15:21:07 -0700
Subject: [PATCH] Importing fixes

---
 CHANGELOG.md                | 1 +
 builds/4chan-X.js           | 7 +++++++
 builds/4chan-X.user.js      | 7 +++++++
 builds/crx/script.js        | 7 +++++++
 src/General/Settings.coffee | 6 ++++++
 5 files changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 125413eec..df7038ca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 seaweedchan:
 - Fix emoji and favicon previews not updating on change.
 - Fix issue with draggong thread watcher
+- Fix some settings not importing when coming from Mayhem's v3
 
 MayhemYDG:
 - Fix bug where a thread would freeze on load.
diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index 281814f55..5790bc2a4 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -9298,6 +9298,13 @@
           });
         }
         data.Conf.WatchedThreads = data.WatchedThreads;
+      } else if (version[0] === '3') {
+        data = Settings.convertSettings(data, {
+          'Reply Hiding': 'Reply Hiding Buttons',
+          'Thread Hiding': 'Thread Hiding Buttons',
+          'Bottom header': 'Bottom Header',
+          'Unread Tab Icon': 'Unread Favicon'
+        });
       }
       return $.set(data.Conf);
     },
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 1e79e6d12..8137c929e 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -9321,6 +9321,13 @@
           });
         }
         data.Conf.WatchedThreads = data.WatchedThreads;
+      } else if (version[0] === '3') {
+        data = Settings.convertSettings(data, {
+          'Reply Hiding': 'Reply Hiding Buttons',
+          'Thread Hiding': 'Thread Hiding Buttons',
+          'Bottom header': 'Bottom Header',
+          'Unread Tab Icon': 'Unread Favicon'
+        });
       }
       return $.set(data.Conf);
     },
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 93043932b..1ffe56f35 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -9302,6 +9302,13 @@
           });
         }
         data.Conf.WatchedThreads = data.WatchedThreads;
+      } else if (version[0] === '3') {
+        data = Settings.convertSettings(data, {
+          'Reply Hiding': 'Reply Hiding Buttons',
+          'Thread Hiding': 'Thread Hiding Buttons',
+          'Bottom header': 'Bottom Header',
+          'Unread Tab Icon': 'Unread Favicon'
+        });
       }
       return $.set(data.Conf);
     },
diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index b2e12f342..6af221f15 100644
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -282,6 +282,12 @@ Settings =
         data.Conf[key] = data.Conf[key].replace(/ctrl|alt|meta/g, (s) -> "#{s[0].toUpperCase()}#{s[1..]}").replace /(^|.+\+)[A-Z]$/g, (s) ->
           "Shift+#{s[0...-1]}#{s[-1..].toLowerCase()}"
       data.Conf.WatchedThreads = data.WatchedThreads
+    else if version[0] is '3'
+      data = Settings.convertSettings data,
+        'Reply Hiding': 'Reply Hiding Buttons'
+        'Thread Hiding': 'Thread Hiding Buttons'
+        'Bottom header': 'Bottom Header'
+        'Unread Tab Icon': 'Unread Favicon'
     $.set data.Conf
   convertSettings: (data, map) ->
     for prevKey, newKey of map