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

Better status messages for mascot importing.

Browse Source
This commit is contained in:
Zixaphir 2014-01-14 13:00:36 -07:00
parent eb1b6e39fc
commit 583f154d19
3 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13163,35 +13163,35 @@
return reader.readAsText(file);
},
load: function(mascots, userMascots) {
var len, mascot, message, name, _i, _len;
var ilen, imported, len, mascot, message, name, type, _i, _len, _ref;
len = Conf["Deleted Mascots"].length;
imported = [];
if (name = mascots["Mascot"]) {
MascotTools.parse(mascots, userMascots);
message = "" + name + " successfully imported!";
MascotTools.parse(mascots, userMascots, imported);
} else if (mascots.length) {
for (_i = 0, _len = mascots.length; _i < _len; _i++) {
mascot = mascots[_i];
MascotTools.parse(mascot, userMascots);
MascotTools.parse(mascot, userMascots, imported);
}
message = "Mascots imported!";
} 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];
$.set('userMascots', userMascots);
if (len !== Conf["Deleted Mascots"].length) {
$.set('Deleted Mascots', Conf['Deleted Mascots']);
}
new Notice('info', message, 10);
new Notice(type, message, 10);
return Settings.openSection.call({
open: Settings.mascots,
hyphenatedTitle: 'mascots'
});
},
parse: function(mascot, userMascots) {
var name;
if (!(name = mascot["Mascot"])) {
new Notice('warning', "Failed to import a mascot. Mascot has no name.", 5);
return;
parse: function(mascot, userMascots, imported) {
var image, message, name;
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);
}
delete mascot["Mascot"];
if (Mascots[name] && !$.remove(Conf["Deleted Mascots"], name)) {
@ -13199,7 +13199,7 @@
return;
}
}
return userMascots[name] = Mascots[name] = mascot;
return imported.push(userMascots[name] = Mascots[name] = mascot);
},
position: function(mascot) {
if (!Style.sheets.mascots) {

24
builds/crx/script.js
View File

@ -13152,35 +13152,35 @@
return reader.readAsText(file);
},
load: function(mascots, userMascots) {
var len, mascot, message, name, _i, _len;
var ilen, imported, len, mascot, message, name, type, _i, _len, _ref;
len = Conf["Deleted Mascots"].length;
imported = [];
if (name = mascots["Mascot"]) {
MascotTools.parse(mascots, userMascots);
message = "" + name + " successfully imported!";
MascotTools.parse(mascots, userMascots, imported);
} else if (mascots.length) {
for (_i = 0, _len = mascots.length; _i < _len; _i++) {
mascot = mascots[_i];
MascotTools.parse(mascot, userMascots);
MascotTools.parse(mascot, userMascots, imported);
}
message = "Mascots imported!";
} 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];
$.set('userMascots', userMascots);
if (len !== Conf["Deleted Mascots"].length) {
$.set('Deleted Mascots', Conf['Deleted Mascots']);
}
new Notice('info', message, 10);
new Notice(type, message, 10);
return Settings.openSection.call({
open: Settings.mascots,
hyphenatedTitle: 'mascots'
});
},
parse: function(mascot, userMascots) {
var name;
if (!(name = mascot["Mascot"])) {
new Notice('warning', "Failed to import a mascot. Mascot has no name.", 5);
return;
parse: function(mascot, userMascots, imported) {
var image, message, name;
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);
}
delete mascot["Mascot"];
if (Mascots[name] && !$.remove(Conf["Deleted Mascots"], name)) {
@ -13188,7 +13188,7 @@
return;
}
}
return userMascots[name] = Mascots[name] = mascot;
return imported.push(userMascots[name] = Mascots[name] = mascot);
},
position: function(mascot) {
if (!Style.sheets.mascots) {

33
src/Theming/Mascots.coffee
View File

@ -352,35 +352,48 @@ MascotTools =
load: (mascots, userMascots) ->
len = Conf["Deleted Mascots"].length
imported = []
if name = mascots["Mascot"]
MascotTools.parse mascots, userMascots
message = "#{name} successfully imported!"
MascotTools.parse mascots, userMascots, imported
else if mascots.length
MascotTools.parse mascot, userMascots for mascot in mascots
message = "Mascots imported!"
MascotTools.parse mascot, userMascots, imported for mascot in mascots
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
["#{name} successfully imported!", 'info']
else if ilen
["#{ilen} mascots successfully imported!", 'info']
else
["Failed to import any mascots. ;__;", 'info']
$.set 'userMascots', userMascots
$.set 'Deleted Mascots', Conf['Deleted Mascots'] unless len is Conf["Deleted Mascots"].length
new Notice 'info', message, 10
new Notice type, message, 10
Settings.openSection.call
open: Settings.mascots
hyphenatedTitle: 'mascots'
parse: (mascot, userMascots) ->
unless name = mascot["Mascot"]
new Notice 'warning', "Failed to import a mascot. Mascot has no name.", 5
return
parse: (mascot, userMascots, imported) ->
unless name = mascot["Mascot"] and image = mascot.image
message = "Failed to import a mascot. File file has no #{if name
'image'
else if image
'name'
else
'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?"
userMascots[name] = Mascots[name] = mascot
imported.push userMascots[name] = Mascots[name] = mascot
position: (mascot) ->
return unless Style.sheets.mascots