Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #723

Browse Source
This commit is contained in:
Zixaphir 2014-06-22 08:32:32 -07:00
parent 7a9f998a1a
commit c59f3c12c0
5 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builds/appchan-x.user.js
View File

@ -6336,7 +6336,6 @@
lastToggledButton = null;
function Menu() {
this.rmEntry = __bind(this.rmEntry, this);
this.onFocus = __bind(this.onFocus, this);
this.keybinds = __bind(this.keybinds, this);
this.close = __bind(this.close, this);
@ -6543,16 +6542,6 @@
return this.entries.push(entry);
};
Menu.prototype.rmEntry = function(e) {
var entry, index;
entry = e.detail;
if (entry.type !== this.type) {
return;
}
index = this.entries.indexOf(entry);
return this.entries.splice(index, 1);
};
Menu.prototype.parseEntry = function(entry) {
var el, subEntries, subEntry, _i, _len;
el = entry.el, subEntries = entry.subEntries;
@ -14240,7 +14229,7 @@
} else {
return new Notice('warning', "Failed to import mascot. Is file a properly formatted JSON file?", 5);
}
_ref = name && (ilen = imported.length) ? ["" + name + " successfully imported!", 'info'] : ilen ? ["" + ilen + " mascots successfully imported!", 'info'] : ["Failed to import any mascots. ;__;", 'info'], message = _ref[0], type = _ref[1];
_ref = name ? ["" + name + " successfully imported!", 'info'] : (ilen = imported.length) ? ["" + ilen + " mascots successfully imported!", 'info'] : ["Failed to import any mascots. ;__;", 'info'], message = _ref[0], type = _ref[1];
$.set('userMascots', userMascots);
if (len !== Conf["Deleted Mascots"].length) {
$.set('Deleted Mascots', Conf['Deleted Mascots']);
@ -14253,7 +14242,7 @@
},
parse: function(mascot, userMascots, imported) {
var image, message, name;
if (!(name = mascot["Mascot"] && (image = mascot.image))) {
if (!((name = mascot["Mascot"]) && (image = mascot.image))) {
message = "Failed to import a mascot. File file has no " + (name ? 'image' : image ? 'name' : 'name nor image') + ".";
return new Notice('warning', message, 5);
}
@ -14263,6 +14252,7 @@
return;
}
}
mascot.name = name;
return imported.push(userMascots[name] = Mascots[name] = mascot);
},
position: function(mascot) {

16
builds/crx/script.js
View File

@ -6390,7 +6390,6 @@
lastToggledButton = null;
function Menu() {
this.rmEntry = __bind(this.rmEntry, this);
this.onFocus = __bind(this.onFocus, this);
this.keybinds = __bind(this.keybinds, this);
this.close = __bind(this.close, this);
@ -6597,16 +6596,6 @@
return this.entries.push(entry);
};
Menu.prototype.rmEntry = function(e) {
var entry, index;
entry = e.detail;
if (entry.type !== this.type) {
return;
}
index = this.entries.indexOf(entry);
return this.entries.splice(index, 1);
};
Menu.prototype.parseEntry = function(entry) {
var el, subEntries, subEntry, _i, _len;
el = entry.el, subEntries = entry.subEntries;
@ -14250,7 +14239,7 @@
} else {
return new Notice('warning', "Failed to import mascot. Is file a properly formatted JSON file?", 5);
}
_ref = name && (ilen = imported.length) ? ["" + name + " successfully imported!", 'info'] : ilen ? ["" + ilen + " mascots successfully imported!", 'info'] : ["Failed to import any mascots. ;__;", 'info'], message = _ref[0], type = _ref[1];
_ref = name ? ["" + name + " successfully imported!", 'info'] : (ilen = imported.length) ? ["" + ilen + " mascots successfully imported!", 'info'] : ["Failed to import any mascots. ;__;", 'info'], message = _ref[0], type = _ref[1];
$.set('userMascots', userMascots);
if (len !== Conf["Deleted Mascots"].length) {
$.set('Deleted Mascots', Conf['Deleted Mascots']);
@ -14263,7 +14252,7 @@
},
parse: function(mascot, userMascots, imported) {
var image, message, name;
if (!(name = mascot["Mascot"] && (image = mascot.image))) {
if (!((name = mascot["Mascot"]) && (image = mascot.image))) {
message = "Failed to import a mascot. File file has no " + (name ? 'image' : image ? 'name' : 'name nor image') + ".";
return new Notice('warning', message, 5);
}
@ -14273,6 +14262,7 @@
return;
}
}
mascot.name = name;
return imported.push(userMascots[name] = Mascots[name] = mascot);
},
position: function(mascot) {

2
questionable.json
View File

@ -1 +1 @@
[{"Mascot":"Akiyama_Mio_sitting","category":"Questionable","image":"//i.minus.com/ibnnAPmolhTfE7.png"},{"Mascot":"Anime_Girl_in_Bondage","category":"Questionable","image":"//i.minus.com/ibbfIrZEoNLmiU.png","center":true},{"Mascot":"Anime_Girl_in_Bondage_2","category":"Questionable","image":"//i.minus.com/iGRED5sHh4RMs.png","center":true},{"Mascot":"Asuka_Langley_Soryu_5","category":"Questionable","image":"//i.minus.com/iJq4VXY1Gw8ZE.png","center":true},{"Mascot":"Ayase_Yue","category":"Questionable","image":"//i.minus.com/ign5fGOZWTx5o.png"},{"Mascot":"Ayase_2","category":"Questionable","image":"//i.minus.com/ibjUbDLSU5pwhK.png","center":true},{"Mascot":"Blue_Rose","category":"Questionable","image":"//i.minus.com/ibiq1joMemfzeM.png","center":true},{"Mascot":"CC2","category":"Questionable","image":"//i.minus.com/iVT3TjJ7lBRpl.png","center":true},{"Mascot":"Cirno","category":"Questionable","image":"//i.minus.com/ibffjW5v0zrSGa.png","center":true},{"Mascot":"Erio_Touwa","category":"Questionable","image":"//i.minus.com/in8bF152Y9qVB.png"},{"Mascot":"Gasai_Yuno_2","category":"Questionable","image":"//i.minus.com/ifyPk7Yeo1JA7.png"},{"Mascot":"Hatsune_Miku","category":"Questionable","image":"//i.minus.com/iHuUwYVywpp3Z.png"},{"Mascot":"Hatsune_Miku_2","category":"Questionable","image":"//i.minus.com/iclhgYeHDD77I.png","center":true},{"Mascot":"Hatsune_Miku_6","category":"Questionable","image":"//i.minus.com/iQzx9fPFgPUNl.png","center":true},{"Mascot":"Hatsune_Miku_7","category":"Questionable","image":"//i.minus.com/iDScshaEZqUuy.png","center":true},{"Mascot":"Horo_3","category":"Questionable","image":"//i.minus.com/ibyT9dlTe1HN5P.png"},{"Mascot":"Horo_4","category":"Questionable","image":"//i.minus.com/ibbMKiznORGJ00.png"},{"Mascot":"Ika_Musume_3","category":"Questionable","image":"//i.minus.com/iby8LyjXffukaI.png","center":true},{"Mascot":"Inori","category":"Questionable","image":"//i.minus.com/ibpHKNPxcFqRxs.png"},{"Mascot":"Inori_2","category":"Questionable","image":"//i.minus.com/ibzM531DBaHYXD.png"},{"Mascot":"Kagamine_Rin","category":"Questionable","image":"//i.minus.com/iVPKJeDXKPKeV.png","center":true},{"Mascot":"Kinomoto_Sakura_2","category":"Questionable","image":"//i.minus.com/ibklztjz3Ua747.png","center":true},{"Mascot":"Kirino_Kosaka_and_Ruri_Goko","category":"Questionable","image":"//i.minus.com/isIzggtfUo4ql.png","center":true},{"Mascot":"Konjiki_no_Yami","category":"Questionable","image":"//i.minus.com/imy7iv5fuym8b.png","position":"bottom"},{"Mascot":"Leonmitchelli","category":"Questionable","image":"//i.minus.com/ibgUFGlOpedfbs.png","center":true},{"Mascot":"Nagato_Yuki_4","category":"Questionable","image":"//i.minus.com/i92tUr90OVZGD.png","center":true},{"Mascot":"Nagato_Yuki_7","category":"Questionable","image":"//i.minus.com/iFQQPEaC3aEV7.png"},{"Mascot":"Nodoka_Miyazaki","category":"Questionable","image":"//i.minus.com/iDX5mImKBzrXK.png"},{"Mascot":"Pixie","category":"Questionable","image":"//i.minus.com/ipRzX1YsTyhgZ.png","center":true},{"Mascot":"Railgun","category":"Questionable","image":"//i.minus.com/iysolfmvz6WKs.png","center":true},{"Mascot":"Saber","category":"Questionable","image":"//i.minus.com/i62cv3csQaqgk.png","center":true},{"Mascot":"Sakurazaki_Setsuna","category":"Questionable","image":"//i.minus.com/iHS6559NMU1tS.png"},{"Mascot":"Seraphim","category":"Questionable","image":"//i.minus.com/ivHaKIFHRpPFP.png","center":true},{"Mascot":"Teletha_Tessa_Testarossa","category":"Questionable","image":"//i.minus.com/iQKrg7Pq7Y6Ed.png"},{"Mascot":"Rukia_Nia_and_Asa","category":"Questionable","image":"//i.minus.com/icECBJR5D5U4S.png"},{"Mascot":"Tifa","category":"Questionable","image":"//i.minus.com/inDzKQ0Wck4ef.png","center":true},{"Mascot":"Udine","category":"Questionable","image":"//i.minus.com/iiycujRmhn6QK.png","position":"bottom"},{"Mascot":"Wanwan","category":"Questionable","image":"//i.minus.com/iTdBWYMCXULLT.png","center":true},{"Mascot":"Yoko_Littner","category":"Questionable","image":"//i.minus.com/i0mtOEsBC9GlY.png"},{"Mascot":"Yoko_Littner_2","category":"Anime","image":"//i.minus.com/i7aUDY4h9uB1T.png","center":true}]
[{"Mascot":"Akiyama_Mio_sitting","category":"Questionable","image":"//i.minus.com/ibnnAPmolhTfE7.png"},{"Mascot":"Anime_Girl_in_Bondage","category":"Questionable","image":"//i.minus.com/ibbfIrZEoNLmiU.png","center":true},{"Mascot":"Anime_Girl_in_Bondage_2","category":"Questionable","image":"//i.minus.com/iGRED5sHh4RMs.png","center":true},{"Mascot":"Asuka_Langley_Soryu_5","category":"Questionable","image":"//i.minus.com/iJq4VXY1Gw8ZE.png","center":true},{"Mascot":"Ayase_Yue","category":"Questionable","image":"//i.minus.com/ign5fGOZWTx5o.png"},{"Mascot":"Ayase_2","category":"Questionable","image":"//i.minus.com/ibjUbDLSU5pwhK.png","center":true},{"Mascot":"Blue_Rose","category":"Questionable","image":"//i.minus.com/ibiq1joMemfzeM.png","center":true},{"Mascot":"CC2","category":"Questionable","image":"//i.minus.com/iVT3TjJ7lBRpl.png","center":true},{"Mascot":"Cirno","category":"Questionable","image":"//i.minus.com/ibffjW5v0zrSGa.png","center":true},{"Mascot":"Erio_Touwa","category":"Questionable","image":"//i.minus.com/in8bF152Y9qVB.png"},{"Mascot":"Gasai_Yuno_2","category":"Questionable","image":"//i.minus.com/ifyPk7Yeo1JA7.png"},{"Mascot":"Hatsune_Miku","category":"Questionable","image":"//i.minus.com/iHuUwYVywpp3Z.png"},{"Mascot":"Hatsune_Miku_2","category":"Questionable","image":"//i.minus.com/iclhgYeHDD77I.png","center":true},{"Mascot":"Hatsune_Miku_6","category":"Questionable","image":"//i.minus.com/iQzx9fPFgPUNl.png","center":true},{"Mascot":"Hatsune_Miku_7","category":"Questionable","image":"//i.minus.com/iDScshaEZqUuy.png","center":true},{"Mascot":"Horo_3","category":"Questionable","image":"//i.minus.com/ibyT9dlTe1HN5P.png"},{"Mascot":"Horo_4","category":"Questionable","image":"//i.minus.com/ibbMKiznORGJ00.png"},{"Mascot":"Ika_Musume_3","category":"Questionable","image":"//i.minus.com/iby8LyjXffukaI.png","center":true},{"Mascot":"Inori","category":"Questionable","image":"//i.minus.com/ibpHKNPxcFqRxs.png"},{"Mascot":"Inori_2","category":"Questionable","image":"//i.minus.com/ibzM531DBaHYXD.png"},{"Mascot":"Kagamine_Rin","category":"Questionable","image":"//i.minus.com/iVPKJeDXKPKeV.png","center":true},{"Mascot":"Kinomoto_Sakura_2","category":"Questionable","image":"//i.minus.com/ibklztjz3Ua747.png","center":true},{"Mascot":"Kirino_Kosaka_and_Ruri_Goko","category":"Questionable","image":"//i.minus.com/isIzggtfUo4ql.png","center":true},{"Mascot":"Konjiki_no_Yami","category":"Questionable","image":"//i.minus.com/imy7iv5fuym8b.png","position":"bottom"},{"Mascot":"Leonmitchelli","category":"Questionable","image":"//i.minus.com/ibgUFGlOpedfbs.png","center":true},{"Mascot":"Nagato_Yuki_4","category":"Questionable","image":"//i.minus.com/i92tUr90OVZGD.png","center":true},{"Mascot":"Nagato_Yuki_7","category":"Questionable","image":"//i.minus.com/iFQQPEaC3aEV7.png"},{"Mascot":"Nodoka_Miyazaki","category":"Questionable","image":"//i.minus.com/iDX5mImKBzrXK.png"},{"Mascot":"Pixie","category":"Questionable","image":"//i.minus.com/ipRzX1YsTyhgZ.png","center":true},{"Mascot":"Railgun","category":"Questionable","image":"//i.minus.com/iysolfmvz6WKs.png","center":true},{"Mascot":"Saber","category":"Questionable","image":"//i.minus.com/i62cv3csQaqgk.png","center":true},{"Mascot":"Sakurazaki_Setsuna","category":"Questionable","image":"//i.minus.com/iHS6559NMU1tS.png"},{"Mascot":"Seraphim","category":"Questionable","image":"//i.minus.com/ivHaKIFHRpPFP.png","center":true},{"Mascot":"Teletha_Tessa_Testarossa","category":"Questionable","image":"//i.minus.com/iQKrg7Pq7Y6Ed.png"},{"Mascot":"Rukia_Nia_and_Asa","category":"Questionable","image":"//i.minus.com/icECBJR5D5U4S.png"},{"Mascot":"Tifa","category":"Questionable","image":"//i.minus.com/inDzKQ0Wck4ef.png","center":true},{"Mascot":"Udine","category":"Questionable","image":"//i.minus.com/iiycujRmhn6QK.png","position":"bottom"},{"Mascot":"Wanwan","category":"Questionable","image":"//i.minus.com/iTdBWYMCXULLT.png","center":true},{"Mascot":"Yoko_Littner","category":"Questionable","image":"//i.minus.com/i0mtOEsBC9GlY.png"}]

6
src/General/UI.coffee
View File

@ -188,12 +188,6 @@ UI = do ->
@parseEntry entry
@entries.push entry
rmEntry: (e) =>
entry = e.detail
return if entry.type isnt @type
index = @entries.indexOf entry
@entries.splice index, 1
parseEntry: (entry) ->
{el, subEntries} = entry
$.addClass el, 'entry'

9
src/Theming/Mascots.coffee
View File

@ -360,9 +360,9 @@ MascotTools =
else
return new Notice 'warning', "Failed to import mascot. Is file a properly formatted JSON file?", 5
[message, type] = if name and ilen = imported.length
[message, type] = if name
["#{name} successfully imported!", 'info']
else if ilen
else if ilen = imported.length
["#{ilen} mascots successfully imported!", 'info']
else
["Failed to import any mascots. ;__;", 'info']
@ -377,7 +377,7 @@ MascotTools =
hyphenatedTitle: 'mascots'
parse: (mascot, userMascots, imported) ->
unless name = mascot["Mascot"] and image = mascot.image
unless (name = mascot["Mascot"]) and image = mascot.image
message = "Failed to import a mascot. File file has no #{if name
'image'
else if image
@ -386,13 +386,14 @@ MascotTools =
'name nor image'}."
return new Notice 'warning', message, 5
delete mascot["Mascot"]
if Mascots[name] and not $.remove Conf["Deleted Mascots"], name
return unless confirm "The mascot #{name} already exists? Would you like to overwrite it?"
mascot.name = name
imported.push userMascots[name] = Mascots[name] = mascot
position: (mascot) ->