share, fix

assets/javascripts/decks.coffee

@@ -83,7 +83,7 @@ class Deck extends Spine.Model
   @configure 'Deck', 'name'
   @hasMany 'card_usages', CardUsage
 
-  @key: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789*-="
+  @key: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_="
   encode: ->
     result = ''
     for card_usage in @card_usages().all()
@@ -207,7 +207,6 @@ class Deck extends Spine.Model
       card_usage.save()
     else
       card_usage.destroy()
-
 class DecksController extends Spine.Controller
   events:
     'mouseover .card_usage': 'show',
@@ -369,6 +368,11 @@ class CardsController extends Spine.Controller
 decks = new DecksController(el: $("#deck"))
 cards = new CardsController(el: $("#search_cards"))
 
+#there is a bug in old version deck editor.
+competition_convert = {'*':'-', '-':'_'}
+if document.location.href.indexOf('*') >= 0
+  location.href = document.location.href.replace /[\*\-]/g, (char)-> competition_convert[char]
+
 $(document).ready ->
   decks.load_from_url()
 
@@ -379,11 +383,12 @@ $(document).ready ->
   #dialog
   $("#deck_share_dialog").dialog
     modal: true
-    autoOpen: false
+    autoOpen: $.url().attr('fragment') == 'share'
+    width: 600
     open: ->
       $("#deck_url").val decks.deck().url()
       $("#deck_url")[0].select()
-      $("#deck_url_qrcode").attr 'src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent(decks.deck().url())
+      $("#deck_url_qrcode").attr 'src', 'https://chart.googleapis.com/chart?chs=171x171&cht=qr&chld=|0&chl=' + encodeURIComponent(decks.deck().url())
 
   $("#drop_upload_dialog").dialog
     dialogClass: 'drop_upload'
@@ -425,7 +430,7 @@ $(document).ready ->
     $("#drop_upload_dialog").dialog('close')
     decks.upload event.dataTransfer.files
 
-  $(".rename_ope").click ->
+  $(".switch").click ->
     $(".text,.graphic").toggleClass("graphic text")
     decks.render()
 

assets/javascripts/decks.js

 // Generated by CoffeeScript 1.6.2
 (function() {
-  var Card, CardUsage, CardsController, Deck, DecksController, cards, decks, locale, _ref, _ref1, _ref2, _ref3, _ref4,
+  var Card, CardUsage, CardsController, Deck, DecksController, cards, competition_convert, decks, locale, _ref, _ref1, _ref2, _ref3, _ref4,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
@@ -219,7 +219,7 @@
 
     Deck.hasMany('card_usages', CardUsage);
 
-    Deck.key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789*-=";
+    Deck.key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_=";
 
     Deck.prototype.encode = function() {
       var c, card_usage, i, result, _i, _j, _len, _ref3;
@@ -852,6 +852,17 @@
     el: $("#search_cards")
   });
 
+  competition_convert = {
+    '*': '-',
+    '-': '_'
+  };
+
+  if (document.location.href.indexOf('*') >= 0) {
+    location.href = document.location.href.replace(/[\*\-]/g, function(char) {
+      return competition_convert[char];
+    });
+  }
+
   $(document).ready(function() {
     decks.load_from_url();
     $('#search').submit(function() {
@@ -860,11 +871,12 @@
     });
     $("#deck_share_dialog").dialog({
       modal: true,
-      autoOpen: false,
+      autoOpen: $.url().attr('fragment') === 'share',
+      width: 600,
       open: function() {
         $("#deck_url").val(decks.deck().url());
         $("#deck_url")[0].select();
-        return $("#deck_url_qrcode").attr('src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent(decks.deck().url()));
+        return $("#deck_url_qrcode").attr('src', 'https://chart.googleapis.com/chart?chs=171x171&cht=qr&chld=|0&chl=' + encodeURIComponent(decks.deck().url()));
       }
     });
     $("#drop_upload_dialog").dialog({
@@ -909,7 +921,7 @@
       $("#drop_upload_dialog").dialog('close');
       return decks.upload(event.dataTransfer.files);
     });
-    $(".rename_ope").click(function() {
+    $(".switch").click(function() {
       $(".text,.graphic").toggleClass("graphic text");
       return decks.render();
     });

assets/stylesheets/decks.less

@@ -137,7 +137,7 @@ body{margin:0;padding:0;background:#eee;}
     }
   }
 
-  .swith{display:block;height:12px;width:14px;float:left;background:url(/assets/images/decks/switch.png) -25px 0 no-repeat;margin:5px 0 0 5px;cursor:pointer;}
+  .switch{display:block;height:12px;width:14px;float:left;background:url(/assets/images/decks/switch.png) -25px 0 no-repeat;margin:5px 0 0 5px;cursor:pointer;}
 
 }
 .select_card{
@@ -188,7 +188,7 @@ body{margin:0;padding:0;background:#eee;}
     /* 一个很神奇的现象，float: left不加的话，Jquery-UI的拖拽不好用，加上去之后没法拖到另一个卡组里... */
   }
 
-  .swith{display:block;height:12px;width:12px;float:left;background:url(/assets/images/decks/switch.png);margin:5px 0 0 5px;cursor:pointer;}
+  .switch{display:block;height:12px;width:12px;float:left;background:url(/assets/images/decks/switch.png);margin:5px 0 0 5px;cursor:pointer;}
   .select_card{
     width:498px;height:35px;padding:5px;border:1px solid #cccccc;background:#F9F9F9;border-radius:6px;margin:10px 0 0 8px;
     select{width:100px;float:left;border:1px solid #ccc;padding:1px;}
@@ -274,7 +274,7 @@ body{margin:0;padding:0;background:#eee;}
     height:72px;border-top:1px solid #dddddd;padding:25px 0 0 0;
     legend{text-align:center;padding:0 15px;margin:-3px 0 0 0;}
   }
-  img{margin:-10px 0 0 50px;width:150px;height:150px;}
+  img{margin:-10px 0 0 50px;}
 }
 
 

decks/new/index.html

@@ -460,7 +460,7 @@
                     </select>
                     <img class="add_ope" src="/assets/images/decks/add.png" alt="" title="新建"/>
                     <!-- <img class="rename_ope" src="/assets/images/decks/rename.png" alt="" title="重命名"/> -->
-                    <div class="swith" style=""></div>
+                    <div class="switch" style=""></div>
                 </div>
                 <div class="select_cardUnder">
                     <div class="donwload_out" title="上传">
@@ -488,7 +488,8 @@
         <fieldset>
             <legend align="center">URL</legend>
             <input id="deck_url" readonly="readonly"/>
-            <button id="deck_url_shorten" style="margin:0 0 0 5px;">shorten</button>
+            <button id="deck_url_shorten" style="margin:0 0 0 5px;">获取短地址</button>
+            <p>复制地址发送给你的好友</p>
         </fieldset>
         <fieldset>
             <legend align="center">share</legend>