deckbuilder deck check

assets/javascripts/decks.coffee

@@ -237,16 +237,16 @@ $(document).ready ->
   $('#deck_load').change ->
     file = @files[0]
     reader = new FileReader()
-    $('#deck_load').attr 'disabled', true
-    $('#name').html deck.deck_name = file.name.split('.')[0]
+    $('#deck_load').attr 'disabled', true if file
     reader.onload = (ev)->
+      $('#deck_load').attr 'disabled', false
       result = []
       lines = ev.target.result.split("\n")
       side = false
       last_id = 0
       count = 0
       for line in lines
-        if line.charAt(0) == '#'
+        if !line or line.charAt(0) == '#'
           continue
         else if line.substr(0,5) == '!side'
           result.push {card_id: last_id, side: side, count: count} if last_id
@@ -260,8 +260,11 @@ $(document).ready ->
               result.push {card_id: last_id, side: side, count: count} if last_id
               last_id = card_id
               count = 1
+          else
+            alert('无效卡组')
+            return
       result.push {card_id: last_id, side: side, count: count} if last_id
-      $('#deck_load').attr 'disabled', false
+      $('#name').html deck.deck_name = file.name.split('.')[0]
       deck.refresh result
       deck.set_history()
     reader.readAsText(file)

assets/javascripts/decks.js

@@ -548,10 +548,12 @@
       var file, reader;
       file = this.files[0];
       reader = new FileReader();
-      $('#deck_load').attr('disabled', true);
-      $('#name').html(deck.deck_name = file.name.split('.')[0]);
+      if (file) {
+        $('#deck_load').attr('disabled', true);
+      }
       reader.onload = function(ev) {
         var card_id, count, last_id, line, lines, result, side, _i, _len;
+        $('#deck_load').attr('disabled', false);
         result = [];
         lines = ev.target.result.split("\n");
         side = false;
@@ -559,7 +561,7 @@
         count = 0;
         for (_i = 0, _len = lines.length; _i < _len; _i++) {
           line = lines[_i];
-          if (line.charAt(0) === '#') {
+          if (!line || line.charAt(0) === '#') {
             continue;
           } else if (line.substr(0, 5) === '!side') {
             if (last_id) {
@@ -586,6 +588,9 @@
                 last_id = card_id;
                 count = 1;
               }
+            } else {
+              alert('无效卡组');
+              return;
             }
           }
         }
@@ -596,7 +601,7 @@
             count: count
           });
         }
-        $('#deck_load').attr('disabled', false);
+        $('#name').html(deck.deck_name = file.name.split('.')[0]);
         deck.refresh(result);
         return deck.set_history();
       };