Fix custom themes.

This commit is contained in:
Zixaphir 2013-05-03 12:30:07 -07:00
parent d83c0fbb7d
commit 6b2e90671b
4 changed files with 43 additions and 32 deletions

View File

@ -11575,12 +11575,16 @@
} else if (origin === 'appchan') { } else if (origin === 'appchan') {
Themes[name] = imported; Themes[name] = imported;
} }
userThemes = $.get("userThemes", {}); return userThemes = $.get("userThemes", {}, function(_arg) {
userThemes[name] = Themes[name]; var userThemes;
$.set('userThemes', userThemes);
alert("Theme \"" + name + "\" imported!"); userThemes = _arg.userThemes;
$.rm($("#themes", d.body)); userThemes[name] = Themes[name];
return Settings.open('themes'); $.set('userThemes', userThemes);
alert("Theme \"" + name + "\" imported!");
$.rm($("#themes", d.body));
return Settings.open('themes');
});
}; };
return reader.readAsText(file); return reader.readAsText(file);
}, },
@ -11597,10 +11601,10 @@
} }
Themes[name] = JSON.parse(JSON.stringify(theme)); Themes[name] = JSON.parse(JSON.stringify(theme));
delete Themes[name]["Theme"]; delete Themes[name]["Theme"];
return $.get("userThemes", {}, function(item) { return $.get("userThemes", {}, function(_arg) {
var userThemes; var userThemes;
userThemes = item["userThemes"]; userThemes = _arg.userThemes;
userThemes[name] = Themes[name]; userThemes[name] = Themes[name];
$.set('userThemes', userThemes); $.set('userThemes', userThemes);
$.set("theme", Conf['theme'] = name); $.set("theme", Conf['theme'] = name);

View File

@ -11596,12 +11596,16 @@
} else if (origin === 'appchan') { } else if (origin === 'appchan') {
Themes[name] = imported; Themes[name] = imported;
} }
userThemes = $.get("userThemes", {}); return userThemes = $.get("userThemes", {}, function(_arg) {
userThemes[name] = Themes[name]; var userThemes;
$.set('userThemes', userThemes);
alert("Theme \"" + name + "\" imported!"); userThemes = _arg.userThemes;
$.rm($("#themes", d.body)); userThemes[name] = Themes[name];
return Settings.open('themes'); $.set('userThemes', userThemes);
alert("Theme \"" + name + "\" imported!");
$.rm($("#themes", d.body));
return Settings.open('themes');
});
}; };
return reader.readAsText(file); return reader.readAsText(file);
}, },
@ -11618,10 +11622,10 @@
} }
Themes[name] = JSON.parse(JSON.stringify(theme)); Themes[name] = JSON.parse(JSON.stringify(theme));
delete Themes[name]["Theme"]; delete Themes[name]["Theme"];
return $.get("userThemes", {}, function(item) { return $.get("userThemes", {}, function(_arg) {
var userThemes; var userThemes;
userThemes = item["userThemes"]; userThemes = _arg.userThemes;
userThemes[name] = Themes[name]; userThemes[name] = Themes[name];
$.set('userThemes', userThemes); $.set('userThemes', userThemes);
$.set("theme", Conf['theme'] = name); $.set("theme", Conf['theme'] = name);

View File

@ -11578,12 +11578,16 @@
} else if (origin === 'appchan') { } else if (origin === 'appchan') {
Themes[name] = imported; Themes[name] = imported;
} }
userThemes = $.get("userThemes", {}); return userThemes = $.get("userThemes", {}, function(_arg) {
userThemes[name] = Themes[name]; var userThemes;
$.set('userThemes', userThemes);
alert("Theme \"" + name + "\" imported!"); userThemes = _arg.userThemes;
$.rm($("#themes", d.body)); userThemes[name] = Themes[name];
return Settings.open('themes'); $.set('userThemes', userThemes);
alert("Theme \"" + name + "\" imported!");
$.rm($("#themes", d.body));
return Settings.open('themes');
});
}; };
return reader.readAsText(file); return reader.readAsText(file);
}, },
@ -11600,10 +11604,10 @@
} }
Themes[name] = JSON.parse(JSON.stringify(theme)); Themes[name] = JSON.parse(JSON.stringify(theme));
delete Themes[name]["Theme"]; delete Themes[name]["Theme"];
return $.get("userThemes", {}, function(item) { return $.get("userThemes", {}, function(_arg) {
var userThemes; var userThemes;
userThemes = item["userThemes"]; userThemes = _arg.userThemes;
userThemes[name] = Themes[name]; userThemes[name] = Themes[name];
$.set('userThemes', userThemes); $.set('userThemes', userThemes);
$.set("theme", Conf['theme'] = name); $.set("theme", Conf['theme'] = name);

View File

@ -361,12 +361,12 @@ ThemeTools =
else if origin == 'appchan' else if origin == 'appchan'
Themes[name] = imported Themes[name] = imported
userThemes = $.get "userThemes", {} userThemes = $.get "userThemes", {}, ({userThemes})->
userThemes[name] = Themes[name] userThemes[name] = Themes[name]
$.set 'userThemes', userThemes $.set 'userThemes', userThemes
alert "Theme \"#{name}\" imported!" alert "Theme \"#{name}\" imported!"
$.rm $("#themes", d.body) $.rm $("#themes", d.body)
Settings.open 'themes' Settings.open 'themes'
reader.readAsText(file) reader.readAsText(file)
@ -381,8 +381,7 @@ ThemeTools =
Themes[name] = JSON.parse(JSON.stringify(theme)) Themes[name] = JSON.parse(JSON.stringify(theme))
delete Themes[name]["Theme"] delete Themes[name]["Theme"]
$.get "userThemes", {}, (item) -> $.get "userThemes", {}, ({userThemes}) ->
userThemes = item["userThemes"]
userThemes[name] = Themes[name] userThemes[name] = Themes[name]
$.set 'userThemes', userThemes $.set 'userThemes', userThemes
$.set "theme", Conf['theme'] = name $.set "theme", Conf['theme'] = name