Commit 61856705 authored by 神楽坂玲奈's avatar 神楽坂玲奈

deck name remove ext

parent 3fa42c3c
...@@ -116,7 +116,7 @@ class Deck extends Spine.Controller ...@@ -116,7 +116,7 @@ class Deck extends Spine.Controller
@html $('#deck_template').tmpl({main: @main, side: @side, extra: @extra, main_count: main_count, side_count: side_count, extra_count: extra_count, category_count: category_count}) @html $('#deck_template').tmpl({main: @main, side: @side, extra: @extra, main_count: main_count, side_count: side_count, extra_count: extra_count, category_count: category_count})
$('#deck_url_ydk').attr 'download', @deck_name + '.ydk' $('#deck_url_ydk').attr 'download', @deck_name + '.ydk'
$('#deck_url_ydk').attr 'href', 'data:application/octet-stream;headers=' + encodeURIComponent('Content-Disposition: attachment; filename=' + @deck_name + '.ydk') + ',' + (card_usage.card_id for i in [0...card_usage.count] for card_usage in @main).concat((card_usage.card_id for i in [0...card_usage.count] for card_usage in @extra), ["!side"], (card_usage.card_id for i in [0...card_usage.count] for card_usage in @side)).join("%0a") $('#deck_url_ydk').attr 'href', 'data:application/octet-stream,' + ((card_usage.card_id for i in [0...card_usage.count]).join("%0a") for card_usage in @main).concat(((card_usage.card_id for i in [0...card_usage.count]).join("%0a") for card_usage in @extra), ["!side"], ((card_usage.card_id for i in [0...card_usage.count]).join("%0a") for card_usage in @side)).join("%0a")
#$('#deck_url_ydk').attr 'href', 'data:application/octet-stream;headers=' + encodeURIComponent('Content-Disposition: attachment; filename=' + @deck_name + '.ydk') + ',' + (card_usage.card_id for i in [0...card_usage.count] for card_usage in @main).concat((card_usage.card_id for i in [0...card_usage.count] for card_usage in @extra), ["!side"], (card_usage.card_id for i in [0...card_usage.count] for card_usage in @side)).join("%0a") #$('#deck_url_ydk').attr 'href', 'data:application/octet-stream;headers=' + encodeURIComponent('Content-Disposition: attachment; filename=' + @deck_name + '.ydk') + ',' + (card_usage.card_id for i in [0...card_usage.count] for card_usage in @main).concat((card_usage.card_id for i in [0...card_usage.count] for card_usage in @extra), ["!side"], (card_usage.card_id for i in [0...card_usage.count] for card_usage in @side)).join("%0a")
$( ".deck_part" ).sortable( $( ".deck_part" ).sortable(
connectWith: ".deck_part" connectWith: ".deck_part"
...@@ -191,8 +191,6 @@ $(document).ready -> ...@@ -191,8 +191,6 @@ $(document).ready ->
modal: true modal: true
autoOpen: false autoOpen: false
deck = new Deck(el: $("#deck")) deck = new Deck(el: $("#deck"))
deck.deck_name = $.url().param('name') deck.deck_name = $.url().param('name')
deck.tab_control() deck.tab_control()
...@@ -215,8 +213,7 @@ $(document).ready -> ...@@ -215,8 +213,7 @@ $(document).ready ->
file = @files[0] file = @files[0]
reader = new FileReader() reader = new FileReader()
$('#deck_load').attr 'disabled', true $('#deck_load').attr 'disabled', true
$('#name').html deck.deck_name = file.name $('#name').html deck.deck_name = file.name.split('.')[0]
reader.readAsText(file)
reader.onload = (ev)-> reader.onload = (ev)->
result = [] result = []
lines = ev.target.result.split("\n") lines = ev.target.result.split("\n")
...@@ -241,6 +238,7 @@ $(document).ready -> ...@@ -241,6 +238,7 @@ $(document).ready ->
result.push {card_id: last_id, side: side, count: count} if last_id result.push {card_id: last_id, side: side, count: count} if last_id
$('#deck_load').attr 'disabled', false $('#deck_load').attr 'disabled', false
deck.refresh result deck.refresh result
reader.readAsText(file)
$.i18n.properties $.i18n.properties
name: 'card' name: 'card'
......
...@@ -303,20 +303,20 @@ ...@@ -303,20 +303,20 @@
category_count: category_count category_count: category_count
})); }));
$('#deck_url_ydk').attr('download', this.deck_name + '.ydk'); $('#deck_url_ydk').attr('download', this.deck_name + '.ydk');
$('#deck_url_ydk').attr('href', 'data:application/octet-stream;headers=' + encodeURIComponent('Content-Disposition: attachment; filename=' + this.deck_name + '.ydk') + ',' + ((function() { $('#deck_url_ydk').attr('href', 'data:application/octet-stream,' + ((function() {
var _j, _len1, _ref1, _results; var _j, _len1, _ref1, _results;
_ref1 = this.main; _ref1 = this.main;
_results = []; _results = [];
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
card_usage = _ref1[_j]; card_usage = _ref1[_j];
_results.push((function() { _results.push(((function() {
var _k, _ref2, _results1; var _k, _ref2, _results1;
_results1 = []; _results1 = [];
for (i = _k = 0, _ref2 = card_usage.count; 0 <= _ref2 ? _k < _ref2 : _k > _ref2; i = 0 <= _ref2 ? ++_k : --_k) { for (i = _k = 0, _ref2 = card_usage.count; 0 <= _ref2 ? _k < _ref2 : _k > _ref2; i = 0 <= _ref2 ? ++_k : --_k) {
_results1.push(card_usage.card_id); _results1.push(card_usage.card_id);
} }
return _results1; return _results1;
})()); })()).join("%0a"));
} }
return _results; return _results;
}).call(this)).concat((function() { }).call(this)).concat((function() {
...@@ -325,14 +325,14 @@ ...@@ -325,14 +325,14 @@
_results = []; _results = [];
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
card_usage = _ref1[_j]; card_usage = _ref1[_j];
_results.push((function() { _results.push(((function() {
var _k, _ref2, _results1; var _k, _ref2, _results1;
_results1 = []; _results1 = [];
for (i = _k = 0, _ref2 = card_usage.count; 0 <= _ref2 ? _k < _ref2 : _k > _ref2; i = 0 <= _ref2 ? ++_k : --_k) { for (i = _k = 0, _ref2 = card_usage.count; 0 <= _ref2 ? _k < _ref2 : _k > _ref2; i = 0 <= _ref2 ? ++_k : --_k) {
_results1.push(card_usage.card_id); _results1.push(card_usage.card_id);
} }
return _results1; return _results1;
})()); })()).join("%0a"));
} }
return _results; return _results;
}).call(this), ["!side"], (function() { }).call(this), ["!side"], (function() {
...@@ -341,14 +341,14 @@ ...@@ -341,14 +341,14 @@
_results = []; _results = [];
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
card_usage = _ref1[_j]; card_usage = _ref1[_j];
_results.push((function() { _results.push(((function() {
var _k, _ref2, _results1; var _k, _ref2, _results1;
_results1 = []; _results1 = [];
for (i = _k = 0, _ref2 = card_usage.count; 0 <= _ref2 ? _k < _ref2 : _k > _ref2; i = 0 <= _ref2 ? ++_k : --_k) { for (i = _k = 0, _ref2 = card_usage.count; 0 <= _ref2 ? _k < _ref2 : _k > _ref2; i = 0 <= _ref2 ? ++_k : --_k) {
_results1.push(card_usage.card_id); _results1.push(card_usage.card_id);
} }
return _results1; return _results1;
})()); })()).join("%0a"));
} }
return _results; return _results;
}).call(this)).join("%0a")); }).call(this)).join("%0a"));
...@@ -502,9 +502,8 @@ ...@@ -502,9 +502,8 @@
file = this.files[0]; file = this.files[0];
reader = new FileReader(); reader = new FileReader();
$('#deck_load').attr('disabled', true); $('#deck_load').attr('disabled', true);
$('#name').html(deck.deck_name = file.name); $('#name').html(deck.deck_name = file.name.split('.')[0]);
reader.readAsText(file); reader.onload = function(ev) {
return reader.onload = function(ev) {
var card_id, count, last_id, line, lines, result, side, _i, _len; var card_id, count, last_id, line, lines, result, side, _i, _len;
result = []; result = [];
lines = ev.target.result.split("\n"); lines = ev.target.result.split("\n");
...@@ -553,6 +552,7 @@ ...@@ -553,6 +552,7 @@
$('#deck_load').attr('disabled', false); $('#deck_load').attr('disabled', false);
return deck.refresh(result); return deck.refresh(result);
}; };
return reader.readAsText(file);
}); });
return $.i18n.properties({ return $.i18n.properties({
name: 'card', name: 'card',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment