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

fix

parent 2807efce
...@@ -305,7 +305,7 @@ class DecksController extends Spine.Controller ...@@ -305,7 +305,7 @@ class DecksController extends Spine.Controller
(card_usage.card_id for i in [0...card_usage.count]).join("\r\n") for card_usage in @deck().side() (card_usage.card_id for i in [0...card_usage.count]).join("\r\n") for card_usage in @deck().side()
).join("\r\n") ).join("\r\n")
else else
$('#deck_url_ydk').attr 'href', @url_ydk() $('#deck_url_ydk').attr 'href', @deck().url_ydk()
@tab_control: -> @tab_control: ->
$(".bottom_area div").click -> $(".bottom_area div").click ->
...@@ -357,22 +357,30 @@ decks = new DecksController(el: $("#deck")) ...@@ -357,22 +357,30 @@ decks = new DecksController(el: $("#deck"))
cards = new CardsController(el: $("#cards_search")) cards = new CardsController(el: $("#cards_search"))
$(document).ready -> $(document).ready ->
$.i18n.properties
name: 'card'
path: '/locales/'
mode: 'map'
cache: true
callback: ->
decks.load_from_url() decks.load_from_url()
$('#search').submit -> $('#search').submit ->
cards.search $('.search_input').val() cards.search $('.search_input').val()
return false return false
#share #dialog
$('#deck_share').click -> $("#deck_share_dialog").dialog
modal: true
autoOpen: false
open: ->
$("#deck_url").val decks.deck().url() $("#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=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent(decks.deck().url())
$("#drop_upload_dialog").dialog
dialogClass: 'drop_upload'
draggable: false
resizable: false
modal: true
autoOpen: false
#share
$('#deck_share').click ->
$("#deck_share_dialog").dialog('open') $("#deck_share_dialog").dialog('open')
$('#deck_url_shorten').click -> $('#deck_url_shorten').click ->
...@@ -384,13 +392,13 @@ $(document).ready -> ...@@ -384,13 +392,13 @@ $(document).ready ->
contentType: 'application/json; charset=utf-8' contentType: 'application/json; charset=utf-8'
success: (data)-> success: (data)->
$("#deck_url").val data.id $("#deck_url").val data.id
$("#deck_url")[0].select()
$('#deck_url_shorten').attr "disabled", false $('#deck_url_shorten').attr "disabled", false
#upload #upload
$('#deck_load').change -> $('#deck_load').change ->
decks.upload(@files) decks.upload(@files)
window.addEventListener 'popstate', (ev)-> window.addEventListener 'popstate', (ev)->
if ev.state if ev.state
deck.refresh ev.state, false deck.refresh ev.state, false
...@@ -408,15 +416,11 @@ $(document).ready -> ...@@ -408,15 +416,11 @@ $(document).ready ->
$(".text,.graphic").toggleClass("graphic text") $(".text,.graphic").toggleClass("graphic text")
decks.render() decks.render()
addthis.init()
$("#deck_share_dialog").dialog $.i18n.properties
modal: true name: 'card'
autoOpen: false path: '/locales/'
mode: 'map'
cache: true
$("#drop_upload_dialog").dialog addthis.init()
dialogClass: 'drop_upload' \ No newline at end of file
draggable: false
resizable: false
modal: true
autoOpen: false
\ No newline at end of file
...@@ -684,7 +684,7 @@ ...@@ -684,7 +684,7 @@
return _results; return _results;
}).call(this)).join("\r\n"))); }).call(this)).join("\r\n")));
} else { } else {
return $('#deck_url_ydk').attr('href', this.url_ydk()); return $('#deck_url_ydk').attr('href', this.deck().url_ydk());
} }
}; };
...@@ -781,20 +781,28 @@ ...@@ -781,20 +781,28 @@
}); });
$(document).ready(function() { $(document).ready(function() {
$.i18n.properties({
name: 'card',
path: '/locales/',
mode: 'map',
cache: true,
callback: function() {
decks.load_from_url(); decks.load_from_url();
$('#search').submit(function() { $('#search').submit(function() {
cards.search($('.search_input').val()); cards.search($('.search_input').val());
return false; return false;
}); });
$('#deck_share').click(function() { $("#deck_share_dialog").dialog({
modal: true,
autoOpen: false,
open: function() {
$("#deck_url").val(decks.deck().url()); $("#deck_url").val(decks.deck().url());
$("#deck_url_qrcode").attr('src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent(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()));
}
});
$("#drop_upload_dialog").dialog({
dialogClass: 'drop_upload',
draggable: false,
resizable: false,
modal: true,
autoOpen: false
});
$('#deck_share').click(function() {
return $("#deck_share_dialog").dialog('open'); return $("#deck_share_dialog").dialog('open');
}); });
$('#deck_url_shorten').click(function() { $('#deck_url_shorten').click(function() {
...@@ -808,6 +816,7 @@ ...@@ -808,6 +816,7 @@
contentType: 'application/json; charset=utf-8', contentType: 'application/json; charset=utf-8',
success: function(data) { success: function(data) {
$("#deck_url").val(data.id); $("#deck_url").val(data.id);
$("#deck_url")[0].select();
return $('#deck_url_shorten').attr("disabled", false); return $('#deck_url_shorten').attr("disabled", false);
} }
}); });
...@@ -829,22 +838,15 @@ ...@@ -829,22 +838,15 @@
decks.upload(event.dataTransfer.files); decks.upload(event.dataTransfer.files);
return false; return false;
}); });
return $(".rename_ope").click(function() { $(".rename_ope").click(function() {
$(".text,.graphic").toggleClass("graphic text"); $(".text,.graphic").toggleClass("graphic text");
return decks.render(); return decks.render();
}); });
} $.i18n.properties({
}); name: 'card',
$("#deck_share_dialog").dialog({ path: '/locales/',
modal: true, mode: 'map',
autoOpen: false cache: true
});
$("#drop_upload_dialog").dialog({
dialogClass: 'drop_upload',
draggable: false,
resizable: false,
modal: true,
autoOpen: false
}); });
return addthis.init(); return addthis.init();
}); });
......
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="deck_share_dialog" title="share"> <div id="deck_share_dialog" title="share" style="display: none">
<fieldset> <fieldset>
<legend>URL</legend> <legend>URL</legend>
<input id="deck_url" readonly="readonly"/><br/> <input id="deck_url" readonly="readonly"/><br/>
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-504b398d148616ce&async=1"></script> src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-504b398d148616ce&async=1"></script>
<!-- AddThis Button END --> <!-- AddThis Button END -->
</div> </div>
<div id="drop_upload_dialog"> <div id="drop_upload_dialog" style="display: none">
上传 上传
</div> </div>
......
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