From 6b2e90671b8a2f965f3c72423847a6594255645e Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Fri, 3 May 2013 12:30:07 -0700
Subject: [PATCH] Fix custom themes.

---
 builds/appchan-x.js       | 20 ++++++++++++--------
 builds/appchan-x.user.js  | 20 ++++++++++++--------
 builds/crx/script.js      | 20 ++++++++++++--------
 src/Theming/Themes.coffee | 15 +++++++--------
 4 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/builds/appchan-x.js b/builds/appchan-x.js
index e1629be78..40947306e 100644
--- a/builds/appchan-x.js
+++ b/builds/appchan-x.js
@@ -11575,12 +11575,16 @@
         } else if (origin === 'appchan') {
           Themes[name] = imported;
         }
-        userThemes = $.get("userThemes", {});
-        userThemes[name] = Themes[name];
-        $.set('userThemes', userThemes);
-        alert("Theme \"" + name + "\" imported!");
-        $.rm($("#themes", d.body));
-        return Settings.open('themes');
+        return userThemes = $.get("userThemes", {}, function(_arg) {
+          var userThemes;
+
+          userThemes = _arg.userThemes;
+          userThemes[name] = Themes[name];
+          $.set('userThemes', userThemes);
+          alert("Theme \"" + name + "\" imported!");
+          $.rm($("#themes", d.body));
+          return Settings.open('themes');
+        });
       };
       return reader.readAsText(file);
     },
@@ -11597,10 +11601,10 @@
       }
       Themes[name] = JSON.parse(JSON.stringify(theme));
       delete Themes[name]["Theme"];
-      return $.get("userThemes", {}, function(item) {
+      return $.get("userThemes", {}, function(_arg) {
         var userThemes;
 
-        userThemes = item["userThemes"];
+        userThemes = _arg.userThemes;
         userThemes[name] = Themes[name];
         $.set('userThemes', userThemes);
         $.set("theme", Conf['theme'] = name);
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index cffb370d9..44719e4ab 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -11596,12 +11596,16 @@
         } else if (origin === 'appchan') {
           Themes[name] = imported;
         }
-        userThemes = $.get("userThemes", {});
-        userThemes[name] = Themes[name];
-        $.set('userThemes', userThemes);
-        alert("Theme \"" + name + "\" imported!");
-        $.rm($("#themes", d.body));
-        return Settings.open('themes');
+        return userThemes = $.get("userThemes", {}, function(_arg) {
+          var userThemes;
+
+          userThemes = _arg.userThemes;
+          userThemes[name] = Themes[name];
+          $.set('userThemes', userThemes);
+          alert("Theme \"" + name + "\" imported!");
+          $.rm($("#themes", d.body));
+          return Settings.open('themes');
+        });
       };
       return reader.readAsText(file);
     },
@@ -11618,10 +11622,10 @@
       }
       Themes[name] = JSON.parse(JSON.stringify(theme));
       delete Themes[name]["Theme"];
-      return $.get("userThemes", {}, function(item) {
+      return $.get("userThemes", {}, function(_arg) {
         var userThemes;
 
-        userThemes = item["userThemes"];
+        userThemes = _arg.userThemes;
         userThemes[name] = Themes[name];
         $.set('userThemes', userThemes);
         $.set("theme", Conf['theme'] = name);
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 126944920..93d01abde 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -11578,12 +11578,16 @@
         } else if (origin === 'appchan') {
           Themes[name] = imported;
         }
-        userThemes = $.get("userThemes", {});
-        userThemes[name] = Themes[name];
-        $.set('userThemes', userThemes);
-        alert("Theme \"" + name + "\" imported!");
-        $.rm($("#themes", d.body));
-        return Settings.open('themes');
+        return userThemes = $.get("userThemes", {}, function(_arg) {
+          var userThemes;
+
+          userThemes = _arg.userThemes;
+          userThemes[name] = Themes[name];
+          $.set('userThemes', userThemes);
+          alert("Theme \"" + name + "\" imported!");
+          $.rm($("#themes", d.body));
+          return Settings.open('themes');
+        });
       };
       return reader.readAsText(file);
     },
@@ -11600,10 +11604,10 @@
       }
       Themes[name] = JSON.parse(JSON.stringify(theme));
       delete Themes[name]["Theme"];
-      return $.get("userThemes", {}, function(item) {
+      return $.get("userThemes", {}, function(_arg) {
         var userThemes;
 
-        userThemes = item["userThemes"];
+        userThemes = _arg.userThemes;
         userThemes[name] = Themes[name];
         $.set('userThemes', userThemes);
         $.set("theme", Conf['theme'] = name);
diff --git a/src/Theming/Themes.coffee b/src/Theming/Themes.coffee
index 268756c57..a820501f4 100644
--- a/src/Theming/Themes.coffee
+++ b/src/Theming/Themes.coffee
@@ -361,12 +361,12 @@ ThemeTools =
       else if origin == 'appchan'
         Themes[name] = imported
 
-      userThemes = $.get "userThemes", {}
-      userThemes[name] = Themes[name]
-      $.set 'userThemes', userThemes
-      alert "Theme \"#{name}\" imported!"
-      $.rm $("#themes", d.body)
-      Settings.open 'themes'
+      userThemes = $.get "userThemes", {}, ({userThemes})->
+        userThemes[name] = Themes[name]
+        $.set 'userThemes', userThemes
+        alert "Theme \"#{name}\" imported!"
+        $.rm $("#themes", d.body)
+        Settings.open 'themes'
 
     reader.readAsText(file)
 
@@ -381,8 +381,7 @@ ThemeTools =
 
     Themes[name] = JSON.parse(JSON.stringify(theme))
     delete Themes[name]["Theme"]
-    $.get "userThemes", {}, (item) ->
-      userThemes = item["userThemes"]
+    $.get "userThemes", {}, ({userThemes}) ->
       userThemes[name] = Themes[name]
       $.set 'userThemes', userThemes
       $.set "theme", Conf['theme'] = name