diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index cf89169b2..3c126e4e3 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -486,20 +486,6 @@ image: '//i.minus.com/irFbpefCFt1cT.png', center: true }, - 'Akiyama_Mio_sitting': { - category: 'Questionable', - image: '//i.minus.com/ibnnAPmolhTfE7.png' - }, - 'Anime_Girl_in_Bondage': { - category: 'Questionable', - image: '//i.minus.com/ibbfIrZEoNLmiU.png', - center: true - }, - 'Anime_Girl_in_Bondage_2': { - category: 'Questionable', - image: '//i.minus.com/iGRED5sHh4RMs.png', - center: true - }, 'Applejack': { category: 'Ponies', image: '//i.minus.com/inZ8jSVsEhfnC.png', @@ -525,11 +511,6 @@ image: '//i.minus.com/ibiiInQGLGnYNj.png', center: true }, - 'Asuka_Langley_Soryu_5': { - category: 'Questionable', - image: '//i.minus.com/iJq4VXY1Gw8ZE.png', - center: true - }, 'Asuka_Langley_Soryu_6': { category: 'Anime', image: '//i.minus.com/ibzbnBcaEtoqck.png', @@ -540,30 +521,16 @@ image: '//i.minus.com/ib0ft5OmqRZx2r.png', center: true }, - 'Ayase_Yue': { - category: 'Questionable', - image: '//i.minus.com/ign5fGOZWTx5o.png' - }, 'Ayase': { category: 'Anime', image: '//i.minus.com/ibmArq5Wb4Po4v.png', center: true }, - 'Ayase_2': { - category: 'Questionable', - image: '//i.minus.com/ibjUbDLSU5pwhK.png', - center: true - }, 'BLACK_ROCK_SHOOTER': { category: 'Anime', image: '//i.minus.com/ibMe9MrTMdvAT.png', center: true }, - 'Blue_Rose': { - category: 'Questionable', - image: '//i.minus.com/ibiq1joMemfzeM.png', - center: true - }, 'Brioche_d_Arquien': { category: 'Anime', image: '//i.minus.com/ibobXYJ2k3JXK.png', @@ -574,21 +541,11 @@ image: '//i.minus.com/iwndO4Pn6SO0X.png', center: true }, - 'CC2': { - category: 'Questionable', - image: '//i.minus.com/iVT3TjJ7lBRpl.png', - center: true - }, 'Chie': { category: 'Anime', image: '//i.minus.com/ib0HI16h9FSjSp.png', center: true }, - 'Cirno': { - category: 'Questionable', - image: '//i.minus.com/ibffjW5v0zrSGa.png', - center: true - }, 'Cirno_2': { category: 'Anime', image: '//i.minus.com/iSZ06ZxrcqAKq.png', @@ -618,10 +575,6 @@ image: '//i.minus.com/ibsk5mMYVR5zuA.png', center: true }, - 'Erio_Touwa': { - category: 'Questionable', - image: '//i.minus.com/in8bF152Y9qVB.png' - }, 'Evangeline_AK_McDowell': { category: 'Anime', image: '//i.minus.com/ibuq7a8zWKi2gl.png', @@ -659,10 +612,6 @@ category: 'Anime', image: '//i.minus.com/iEQsK6K85jX2n.png' }, - 'Gasai_Yuno_2': { - category: 'Questionable', - image: '//i.minus.com/ifyPk7Yeo1JA7.png' - }, 'George_Costanza': { category: 'Western', image: '//i.minus.com/iFWdpFGfzLs6v.png' @@ -677,15 +626,6 @@ image: '//i.minus.com/iqBTFZf5UhLpR.png', center: true }, - 'Hatsune_Miku': { - category: 'Questionable', - image: '//i.minus.com/iHuUwYVywpp3Z.png' - }, - 'Hatsune_Miku_2': { - category: 'Questionable', - image: '//i.minus.com/iclhgYeHDD77I.png', - center: true - }, 'Hatsune_Miku_3': { category: 'Anime', image: '//i.minus.com/iLJ4uDTcg1T8r.png', @@ -701,16 +641,6 @@ image: '//i.minus.com/i9Evu9dyvok4G.png', center: true }, - 'Hatsune_Miku_6': { - category: 'Questionable', - image: '//i.minus.com/iQzx9fPFgPUNl.png', - center: true - }, - 'Hatsune_Miku_7': { - category: 'Questionable', - image: '//i.minus.com/iDScshaEZqUuy.png', - center: true - }, 'Hirasawa_Yui': { category: 'Anime', image: '//i.minus.com/iuGe5uDaTNmhR.png', @@ -731,14 +661,6 @@ silhouette: true, width: 205 }, - 'Horo_3': { - category: 'Questionable', - image: '//i.minus.com/ibyT9dlTe1HN5P.png' - }, - 'Horo_4': { - category: 'Questionable', - image: '//i.minus.com/ibbMKiznORGJ00.png' - }, 'Ika_Musume': { category: 'Anime', image: '//i.minus.com/ibqVu5GNfKx5bC.png', @@ -749,19 +671,6 @@ image: '//i.minus.com/ibhnEiE8HabEqC.png', center: true }, - 'Ika_Musume_3': { - category: 'Questionable', - image: '//i.minus.com/iby8LyjXffukaI.png', - center: true - }, - 'Inori': { - category: 'Questionable', - image: '//i.minus.com/ibpHKNPxcFqRxs.png' - }, - 'Inori_2': { - category: 'Questionable', - image: '//i.minus.com/ibzM531DBaHYXD.png' - }, 'Iwakura_Lain': { category: 'Anime', image: '//i.minus.com/iBXRRT19scoHf.png', @@ -777,11 +686,6 @@ image: '//i.minus.com/ibndVLiH09uINs.png', center: true }, - 'Kagamine_Rin': { - category: 'Questionable', - image: '//i.minus.com/iVPKJeDXKPKeV.png', - center: true - }, 'Kagamine_Rin_2': { category: 'Anime', image: '//i.minus.com/jbkL01TIeJwEN6.png' @@ -810,20 +714,10 @@ image: '//i.minus.com/iVmsLKa4zLwZR.png', center: true }, - 'Kinomoto_Sakura_2': { - category: 'Questionable', - image: '//i.minus.com/ibklztjz3Ua747.png', - center: true - }, 'Kirisame_Marisa': { category: 'Anime', image: '//i.minus.com/ibikDZH5CZ0V30.png' }, - 'Kirino_Kosaka_and_Ruri_Goko': { - category: 'Questionable', - image: '//i.minus.com/isIzggtfUo4ql.png', - center: true - }, 'Koiwai_Yotsuba': { category: 'Anime', image: '//i.minus.com/iKFKyVVBato2N.png', @@ -834,11 +728,6 @@ image: '//i.minus.com/ieVyNMSjXpBs2.png', center: true }, - 'Konjiki_no_Yami': { - category: 'Questionable', - image: '//i.minus.com/imy7iv5fuym8b.png', - position: 'bottom' - }, 'Kotobuki_Tsumugi': { category: 'Anime', image: '//i.minus.com/i6doAUnM6jMAY.png', @@ -866,11 +755,6 @@ image: '//i.minus.com/iGlKiDZvM3xi8.png', center: true }, - 'Leonmitchelli': { - category: 'Questionable', - image: '//i.minus.com/ibgUFGlOpedfbs.png', - center: true - }, 'Li_Syaoran': { category: 'Anime', image: '//i.minus.com/ib0IWPBRSHyiDe.png' @@ -956,11 +840,6 @@ image: '//i.minus.com/ibndIkldw4njbD.png', center: true }, - 'Nagato_Yuki_4': { - category: 'Questionable', - image: '//i.minus.com/i92tUr90OVZGD.png', - center: true - }, 'Nagato_Yuki_5': { category: 'Silhouette', width: 202, @@ -968,18 +847,10 @@ silhouette: true, center: true }, - 'Nagato_Yuki_7': { - category: 'Questionable', - image: '//i.minus.com/iFQQPEaC3aEV7.png' - }, 'Nakano_Azusa': { category: 'Anime', image: '//i.minus.com/iiptfoMlr4v1k.png' }, - 'Nodoka_Miyazaki': { - category: 'Questionable', - image: '//i.minus.com/iDX5mImKBzrXK.png' - }, 'Nichijou': { category: 'Anime', image: '//i.minus.com/iE8lbZ5f3OT2B.png' @@ -1027,16 +898,6 @@ image: '//i.minus.com/ibdwMaIPwdscao.png', center: true }, - 'Pixie': { - category: 'Questionable', - image: '//i.minus.com/ipRzX1YsTyhgZ.png', - center: true - }, - 'Railgun': { - category: 'Questionable', - image: '//i.minus.com/iysolfmvz6WKs.png', - center: true - }, 'Railgun_2': { category: 'Anime', image: '//i.minus.com/iNhpDDO0GSTeM.png', @@ -1078,15 +939,6 @@ image: '//i.minus.com/iecVz4p2SuqK4.png', position: 'bottom' }, - 'Saber': { - category: 'Questionable', - image: '//i.minus.com/i62cv3csQaqgk.png', - center: true - }, - 'Sakurazaki_Setsuna': { - category: 'Questionable', - image: '//i.minus.com/iHS6559NMU1tS.png' - }, 'Samus_Aran': { category: 'Anime', image: '//i.minus.com/iWG1GFJ89A05p.png', @@ -1096,11 +948,6 @@ category: 'Anime', image: '//i.minus.com/ibl4efsNtHpkXg.png' }, - 'Seraphim': { - category: 'Questionable', - image: '//i.minus.com/ivHaKIFHRpPFP.png', - center: true - }, 'Shana': { category: 'Anime', image: '//i.minus.com/ib2cTJMF0cYIde.png', @@ -1156,23 +1003,10 @@ image: '//i.minus.com/iQL2bwpDfOgk.png', center: true }, - 'Teletha_Tessa_Testarossa': { - category: 'Questionable', - image: '//i.minus.com/iQKrg7Pq7Y6Ed.png' - }, - 'Rukia_Nia_and_Asa': { - category: 'Questionable', - image: '//i.minus.com/icECBJR5D5U4S.png' - }, 'Tewi_Inaba': { category: 'Anime', image: '//i.minus.com/ib2k9lwQIkmb66.png' }, - 'Tifa': { - category: 'Questionable', - image: '//i.minus.com/inDzKQ0Wck4ef.png', - center: true - }, 'Tomozo_Kaoru': { category: 'Anime', image: '//i.minus.com/islUcBaPRYAgv.png', @@ -1183,16 +1017,6 @@ image: '//i.minus.com/ibnMYVTZEykrKU.png', center: true }, - 'Udine': { - category: 'Questionable', - image: '//i.minus.com/iiycujRmhn6QK.png', - position: 'bottom' - }, - 'Wanwan': { - category: 'Questionable', - image: '//i.minus.com/iTdBWYMCXULLT.png', - center: true - }, 'White_Curious': { category: 'Anime', image: '//i.minus.com/ibfkj5osu99axe.png', @@ -1211,10 +1035,6 @@ image: '//i.minus.com/izkTpyjr1XlLR.png', center: true }, - 'Yoko_Littner': { - category: 'Questionable', - image: '//i.minus.com/i0mtOEsBC9GlY.png' - }, 'Yoko_Littner_2': { category: 'Anime', image: '//i.minus.com/i7aUDY4h9uB1T.png', @@ -13336,7 +13156,7 @@ return; } if (name = mascots["Mascot"]) { - MascotTools.parse(mascot); + MascotTools.parse(mascots); message = "" + name + " successfully imported!"; } else if (mascots.length) { for (_i = 0, _len = mascots.length; _i < _len; _i++) { @@ -13348,7 +13168,6 @@ return new Notice('warning', "Failed to import mascot. Is file a properly formatted JSON file?", 5); } new Notice('info', message, 10); - $.rm($("#mascotContainer", d.body)); return Settings.open('Mascots'); }; return reader.readAsText(file); diff --git a/builds/crx/script.js b/builds/crx/script.js index b3ac28730..ced5466d5 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -464,20 +464,6 @@ image: '//i.minus.com/irFbpefCFt1cT.png', center: true }, - 'Akiyama_Mio_sitting': { - category: 'Questionable', - image: '//i.minus.com/ibnnAPmolhTfE7.png' - }, - 'Anime_Girl_in_Bondage': { - category: 'Questionable', - image: '//i.minus.com/ibbfIrZEoNLmiU.png', - center: true - }, - 'Anime_Girl_in_Bondage_2': { - category: 'Questionable', - image: '//i.minus.com/iGRED5sHh4RMs.png', - center: true - }, 'Applejack': { category: 'Ponies', image: '//i.minus.com/inZ8jSVsEhfnC.png', @@ -503,11 +489,6 @@ image: '//i.minus.com/ibiiInQGLGnYNj.png', center: true }, - 'Asuka_Langley_Soryu_5': { - category: 'Questionable', - image: '//i.minus.com/iJq4VXY1Gw8ZE.png', - center: true - }, 'Asuka_Langley_Soryu_6': { category: 'Anime', image: '//i.minus.com/ibzbnBcaEtoqck.png', @@ -518,30 +499,16 @@ image: '//i.minus.com/ib0ft5OmqRZx2r.png', center: true }, - 'Ayase_Yue': { - category: 'Questionable', - image: '//i.minus.com/ign5fGOZWTx5o.png' - }, 'Ayase': { category: 'Anime', image: '//i.minus.com/ibmArq5Wb4Po4v.png', center: true }, - 'Ayase_2': { - category: 'Questionable', - image: '//i.minus.com/ibjUbDLSU5pwhK.png', - center: true - }, 'BLACK_ROCK_SHOOTER': { category: 'Anime', image: '//i.minus.com/ibMe9MrTMdvAT.png', center: true }, - 'Blue_Rose': { - category: 'Questionable', - image: '//i.minus.com/ibiq1joMemfzeM.png', - center: true - }, 'Brioche_d_Arquien': { category: 'Anime', image: '//i.minus.com/ibobXYJ2k3JXK.png', @@ -552,21 +519,11 @@ image: '//i.minus.com/iwndO4Pn6SO0X.png', center: true }, - 'CC2': { - category: 'Questionable', - image: '//i.minus.com/iVT3TjJ7lBRpl.png', - center: true - }, 'Chie': { category: 'Anime', image: '//i.minus.com/ib0HI16h9FSjSp.png', center: true }, - 'Cirno': { - category: 'Questionable', - image: '//i.minus.com/ibffjW5v0zrSGa.png', - center: true - }, 'Cirno_2': { category: 'Anime', image: '//i.minus.com/iSZ06ZxrcqAKq.png', @@ -596,10 +553,6 @@ image: '//i.minus.com/ibsk5mMYVR5zuA.png', center: true }, - 'Erio_Touwa': { - category: 'Questionable', - image: '//i.minus.com/in8bF152Y9qVB.png' - }, 'Evangeline_AK_McDowell': { category: 'Anime', image: '//i.minus.com/ibuq7a8zWKi2gl.png', @@ -637,10 +590,6 @@ category: 'Anime', image: '//i.minus.com/iEQsK6K85jX2n.png' }, - 'Gasai_Yuno_2': { - category: 'Questionable', - image: '//i.minus.com/ifyPk7Yeo1JA7.png' - }, 'George_Costanza': { category: 'Western', image: '//i.minus.com/iFWdpFGfzLs6v.png' @@ -655,15 +604,6 @@ image: '//i.minus.com/iqBTFZf5UhLpR.png', center: true }, - 'Hatsune_Miku': { - category: 'Questionable', - image: '//i.minus.com/iHuUwYVywpp3Z.png' - }, - 'Hatsune_Miku_2': { - category: 'Questionable', - image: '//i.minus.com/iclhgYeHDD77I.png', - center: true - }, 'Hatsune_Miku_3': { category: 'Anime', image: '//i.minus.com/iLJ4uDTcg1T8r.png', @@ -679,16 +619,6 @@ image: '//i.minus.com/i9Evu9dyvok4G.png', center: true }, - 'Hatsune_Miku_6': { - category: 'Questionable', - image: '//i.minus.com/iQzx9fPFgPUNl.png', - center: true - }, - 'Hatsune_Miku_7': { - category: 'Questionable', - image: '//i.minus.com/iDScshaEZqUuy.png', - center: true - }, 'Hirasawa_Yui': { category: 'Anime', image: '//i.minus.com/iuGe5uDaTNmhR.png', @@ -709,14 +639,6 @@ silhouette: true, width: 205 }, - 'Horo_3': { - category: 'Questionable', - image: '//i.minus.com/ibyT9dlTe1HN5P.png' - }, - 'Horo_4': { - category: 'Questionable', - image: '//i.minus.com/ibbMKiznORGJ00.png' - }, 'Ika_Musume': { category: 'Anime', image: '//i.minus.com/ibqVu5GNfKx5bC.png', @@ -727,19 +649,6 @@ image: '//i.minus.com/ibhnEiE8HabEqC.png', center: true }, - 'Ika_Musume_3': { - category: 'Questionable', - image: '//i.minus.com/iby8LyjXffukaI.png', - center: true - }, - 'Inori': { - category: 'Questionable', - image: '//i.minus.com/ibpHKNPxcFqRxs.png' - }, - 'Inori_2': { - category: 'Questionable', - image: '//i.minus.com/ibzM531DBaHYXD.png' - }, 'Iwakura_Lain': { category: 'Anime', image: '//i.minus.com/iBXRRT19scoHf.png', @@ -755,11 +664,6 @@ image: '//i.minus.com/ibndVLiH09uINs.png', center: true }, - 'Kagamine_Rin': { - category: 'Questionable', - image: '//i.minus.com/iVPKJeDXKPKeV.png', - center: true - }, 'Kagamine_Rin_2': { category: 'Anime', image: '//i.minus.com/jbkL01TIeJwEN6.png' @@ -788,20 +692,10 @@ image: '//i.minus.com/iVmsLKa4zLwZR.png', center: true }, - 'Kinomoto_Sakura_2': { - category: 'Questionable', - image: '//i.minus.com/ibklztjz3Ua747.png', - center: true - }, 'Kirisame_Marisa': { category: 'Anime', image: '//i.minus.com/ibikDZH5CZ0V30.png' }, - 'Kirino_Kosaka_and_Ruri_Goko': { - category: 'Questionable', - image: '//i.minus.com/isIzggtfUo4ql.png', - center: true - }, 'Koiwai_Yotsuba': { category: 'Anime', image: '//i.minus.com/iKFKyVVBato2N.png', @@ -812,11 +706,6 @@ image: '//i.minus.com/ieVyNMSjXpBs2.png', center: true }, - 'Konjiki_no_Yami': { - category: 'Questionable', - image: '//i.minus.com/imy7iv5fuym8b.png', - position: 'bottom' - }, 'Kotobuki_Tsumugi': { category: 'Anime', image: '//i.minus.com/i6doAUnM6jMAY.png', @@ -844,11 +733,6 @@ image: '//i.minus.com/iGlKiDZvM3xi8.png', center: true }, - 'Leonmitchelli': { - category: 'Questionable', - image: '//i.minus.com/ibgUFGlOpedfbs.png', - center: true - }, 'Li_Syaoran': { category: 'Anime', image: '//i.minus.com/ib0IWPBRSHyiDe.png' @@ -934,11 +818,6 @@ image: '//i.minus.com/ibndIkldw4njbD.png', center: true }, - 'Nagato_Yuki_4': { - category: 'Questionable', - image: '//i.minus.com/i92tUr90OVZGD.png', - center: true - }, 'Nagato_Yuki_5': { category: 'Silhouette', width: 202, @@ -946,18 +825,10 @@ silhouette: true, center: true }, - 'Nagato_Yuki_7': { - category: 'Questionable', - image: '//i.minus.com/iFQQPEaC3aEV7.png' - }, 'Nakano_Azusa': { category: 'Anime', image: '//i.minus.com/iiptfoMlr4v1k.png' }, - 'Nodoka_Miyazaki': { - category: 'Questionable', - image: '//i.minus.com/iDX5mImKBzrXK.png' - }, 'Nichijou': { category: 'Anime', image: '//i.minus.com/iE8lbZ5f3OT2B.png' @@ -1005,16 +876,6 @@ image: '//i.minus.com/ibdwMaIPwdscao.png', center: true }, - 'Pixie': { - category: 'Questionable', - image: '//i.minus.com/ipRzX1YsTyhgZ.png', - center: true - }, - 'Railgun': { - category: 'Questionable', - image: '//i.minus.com/iysolfmvz6WKs.png', - center: true - }, 'Railgun_2': { category: 'Anime', image: '//i.minus.com/iNhpDDO0GSTeM.png', @@ -1056,15 +917,6 @@ image: '//i.minus.com/iecVz4p2SuqK4.png', position: 'bottom' }, - 'Saber': { - category: 'Questionable', - image: '//i.minus.com/i62cv3csQaqgk.png', - center: true - }, - 'Sakurazaki_Setsuna': { - category: 'Questionable', - image: '//i.minus.com/iHS6559NMU1tS.png' - }, 'Samus_Aran': { category: 'Anime', image: '//i.minus.com/iWG1GFJ89A05p.png', @@ -1074,11 +926,6 @@ category: 'Anime', image: '//i.minus.com/ibl4efsNtHpkXg.png' }, - 'Seraphim': { - category: 'Questionable', - image: '//i.minus.com/ivHaKIFHRpPFP.png', - center: true - }, 'Shana': { category: 'Anime', image: '//i.minus.com/ib2cTJMF0cYIde.png', @@ -1134,23 +981,10 @@ image: '//i.minus.com/iQL2bwpDfOgk.png', center: true }, - 'Teletha_Tessa_Testarossa': { - category: 'Questionable', - image: '//i.minus.com/iQKrg7Pq7Y6Ed.png' - }, - 'Rukia_Nia_and_Asa': { - category: 'Questionable', - image: '//i.minus.com/icECBJR5D5U4S.png' - }, 'Tewi_Inaba': { category: 'Anime', image: '//i.minus.com/ib2k9lwQIkmb66.png' }, - 'Tifa': { - category: 'Questionable', - image: '//i.minus.com/inDzKQ0Wck4ef.png', - center: true - }, 'Tomozo_Kaoru': { category: 'Anime', image: '//i.minus.com/islUcBaPRYAgv.png', @@ -1161,16 +995,6 @@ image: '//i.minus.com/ibnMYVTZEykrKU.png', center: true }, - 'Udine': { - category: 'Questionable', - image: '//i.minus.com/iiycujRmhn6QK.png', - position: 'bottom' - }, - 'Wanwan': { - category: 'Questionable', - image: '//i.minus.com/iTdBWYMCXULLT.png', - center: true - }, 'White_Curious': { category: 'Anime', image: '//i.minus.com/ibfkj5osu99axe.png', @@ -1189,10 +1013,6 @@ image: '//i.minus.com/izkTpyjr1XlLR.png', center: true }, - 'Yoko_Littner': { - category: 'Questionable', - image: '//i.minus.com/i0mtOEsBC9GlY.png' - }, 'Yoko_Littner_2': { category: 'Anime', image: '//i.minus.com/i7aUDY4h9uB1T.png', @@ -13325,7 +13145,7 @@ return; } if (name = mascots["Mascot"]) { - MascotTools.parse(mascot); + MascotTools.parse(mascots); message = "" + name + " successfully imported!"; } else if (mascots.length) { for (_i = 0, _len = mascots.length; _i < _len; _i++) { @@ -13337,7 +13157,6 @@ return new Notice('warning', "Failed to import mascot. Is file a properly formatted JSON file?", 5); } new Notice('info', message, 10); - $.rm($("#mascotContainer", d.body)); return Settings.open('Mascots'); }; return reader.readAsText(file); diff --git a/src/Theming/Mascots.coffee b/src/Theming/Mascots.coffee index 78ecffc38..b5bd1962b 100644 --- a/src/Theming/Mascots.coffee +++ b/src/Theming/Mascots.coffee @@ -346,7 +346,7 @@ MascotTools = return if name = mascots["Mascot"] - MascotTools.parse mascot + MascotTools.parse mascots message = "#{name} successfully imported!" else if mascots.length MascotTools.parse mascot for mascot in mascots @@ -356,7 +356,6 @@ MascotTools = new Notice 'info', message, 10 - $.rm $ "#mascotContainer", d.body Settings.open 'Mascots' reader.readAsText file