From 572773ad8b87c35cff40d245f8f567dda1f844aa Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Tue, 14 Jan 2014 02:04:23 -0700 Subject: [PATCH] Looks like the import mascot code was broken anyways! --- builds/appchan-x.user.js | 6 ++---- builds/crx/script.js | 6 ++---- src/General/Settings.coffee | 3 +-- src/Theming/Mascots.coffee | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 6f2576ff1..cf89169b2 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -13365,7 +13365,7 @@ return; } } - Mascots[name] = imported; + Mascots[name] = mascot; return $.get("userMascots", {}, function(_arg) { var userMascots; userMascots = _arg.userMascots; @@ -16857,9 +16857,7 @@ $.on($("#importMascot", batchmascots), 'click', function() { return this.nextSibling.click(); }); - $.on($("#importMascotButton", batchmascots), 'change', function(e) { - return MascotTools.importMascot(e); - }); + $.on($("#importMascotButton", batchmascots), 'change', MascotTools.importMascot); $.on($('#undelete', batchmascots), 'click', function() { var mascots; if (!(Conf["Deleted Mascots"].length > 0)) { diff --git a/builds/crx/script.js b/builds/crx/script.js index 82da9afc2..b3ac28730 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -13354,7 +13354,7 @@ return; } } - Mascots[name] = imported; + Mascots[name] = mascot; return $.get("userMascots", {}, function(_arg) { var userMascots; userMascots = _arg.userMascots; @@ -16850,9 +16850,7 @@ $.on($("#importMascot", batchmascots), 'click', function() { return this.nextSibling.click(); }); - $.on($("#importMascotButton", batchmascots), 'change', function(e) { - return MascotTools.importMascot(e); - }); + $.on($("#importMascotButton", batchmascots), 'change', MascotTools.importMascot); $.on($('#undelete', batchmascots), 'click', function() { var mascots; if (!(Conf["Deleted Mascots"].length > 0)) { diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index 0bff26718..566f37ebc 100755 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -727,8 +727,7 @@ Settings = $.on $("#importMascot", batchmascots), 'click', -> @nextSibling.click() - $.on $("#importMascotButton", batchmascots), 'change', (e) -> - MascotTools.importMascot e + $.on $("#importMascotButton", batchmascots), 'change', MascotTools.importMascot $.on $('#undelete', batchmascots), 'click', -> unless Conf["Deleted Mascots"].length > 0 diff --git a/src/Theming/Mascots.coffee b/src/Theming/Mascots.coffee index 1b75d070a..78ecffc38 100644 --- a/src/Theming/Mascots.coffee +++ b/src/Theming/Mascots.coffee @@ -371,7 +371,7 @@ MascotTools = if Mascots[name] and not $.remove Conf["Deleted Mascots"], name return unless confirm "The mascot #{name} already exists? Would you like to overwrite it?" - Mascots[name] = imported + Mascots[name] = mascot $.get "userMascots", {}, ({userMascots}) -> userMascots[name] = Mascots[name]