Skip to content

M
Moecube Store
Commit e9a94aed authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

fix

parent 2807efce
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 116 deletions
assets/javascripts/decks.coffee
View file @ e9a94aed
...@@ -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,66 +357,70 @@ decks = new DecksController(el: $("#deck")) ...@@ -357,66 +357,70 @@ decks = new DecksController(el: $("#deck"))
cards = new CardsController(el: $("#cards_search")) cards = new CardsController(el: $("#cards_search"))
$(document).ready -> $(document).ready ->
decks.load_from_url()
$('#search').submit ->
cards.search $('.search_input').val()
return false
#dialog
$("#deck_share_dialog").dialog
modal: true
autoOpen: false
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())
$("#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_url_shorten').click ->
$('#deck_url_shorten').attr "disabled", true
$.ajax
url: 'https://www.googleapis.com/urlshortener/v1/url'
type: 'POST'
data: JSON.stringify {longUrl: decks.deck().url()}
contentType: 'application/json; charset=utf-8'
success: (data)->
$("#deck_url").val data.id
$("#deck_url")[0].select()
$('#deck_url_shorten').attr "disabled", false
#upload
$('#deck_load').change ->
decks.upload(@files)
window.addEventListener 'popstate', (ev)->
if ev.state
deck.refresh ev.state, false
$('.main_div').bind 'dragover', (ev)->
$("#drop_upload_dialog").dialog('open')
false
$("#drop_upload_dialog").bind 'drop', (ev)->
$("#drop_upload_dialog").dialog('close')
decks.upload event.dataTransfer.files
false
$(".rename_ope").click ->
$(".text,.graphic").toggleClass("graphic text")
decks.render()
$.i18n.properties $.i18n.properties
name: 'card' name: 'card'
path: '/locales/' path: '/locales/'
mode: 'map' mode: 'map'
cache: true cache: true
callback: ->
decks.load_from_url() addthis.init()
\ No newline at end of file
$('#search').submit ->
cards.search $('.search_input').val()
return false
#share
$('#deck_share').click ->
$("#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_share_dialog").dialog('open')
$('#deck_url_shorten').click ->
$('#deck_url_shorten').attr "disabled", true
$.ajax
url: 'https://www.googleapis.com/urlshortener/v1/url'
type: 'POST'
data: JSON.stringify {longUrl: decks.deck().url()}
contentType: 'application/json; charset=utf-8'
success: (data)->
$("#deck_url").val data.id
$('#deck_url_shorten').attr "disabled", false
#upload
$('#deck_load').change ->
decks.upload(@files)
window.addEventListener 'popstate', (ev)->
if ev.state
deck.refresh ev.state, false
$('.main_div').bind 'dragover', (ev)->
$("#drop_upload_dialog").dialog('open')
false
$("#drop_upload_dialog").bind 'drop', (ev)->
$("#drop_upload_dialog").dialog('close')
decks.upload event.dataTransfer.files
false
$(".rename_ope").click ->
$(".text,.graphic").toggleClass("graphic text")
decks.render()
addthis.init()
$("#deck_share_dialog").dialog
modal: true
autoOpen: false
$("#drop_upload_dialog").dialog
dialogClass: 'drop_upload'
draggable: false
resizable: false
modal: true
autoOpen: false
\ No newline at end of file
assets/javascripts/decks.js
View file @ e9a94aed
...@@ -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,63 +781,19 @@ ...@@ -781,63 +781,19 @@
}); });
$(document).ready(function() { $(document).ready(function() {
$.i18n.properties({ decks.load_from_url();
name: 'card', $('#search').submit(function() {
path: '/locales/', cards.search($('.search_input').val());
mode: 'map', return false;
cache: true,
callback: function() {
decks.load_from_url();
$('#search').submit(function() {
cards.search($('.search_input').val());
return false;
});
$('#deck_share').click(function() {
$("#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()));
return $("#deck_share_dialog").dialog('open');
});
$('#deck_url_shorten').click(function() {
$('#deck_url_shorten').attr("disabled", true);
return $.ajax({
url: 'https://www.googleapis.com/urlshortener/v1/url',
type: 'POST',
data: JSON.stringify({
longUrl: decks.deck().url()
}),
contentType: 'application/json; charset=utf-8',
success: function(data) {
$("#deck_url").val(data.id);
return $('#deck_url_shorten').attr("disabled", false);
}
});
});
$('#deck_load').change(function() {
return decks.upload(this.files);
});
window.addEventListener('popstate', function(ev) {
if (ev.state) {
return deck.refresh(ev.state, false);
}
});
$('.main_div').bind('dragover', function(ev) {
$("#drop_upload_dialog").dialog('open');
return false;
});
$("#drop_upload_dialog").bind('drop', function(ev) {
$("#drop_upload_dialog").dialog('close');
decks.upload(event.dataTransfer.files);
return false;
});
return $(".rename_ope").click(function() {
$(".text,.graphic").toggleClass("graphic text");
return decks.render();
});
}
}); });
$("#deck_share_dialog").dialog({ $("#deck_share_dialog").dialog({
modal: true, modal: true,
autoOpen: false autoOpen: false,
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()));
}
}); });
$("#drop_upload_dialog").dialog({ $("#drop_upload_dialog").dialog({
dialogClass: 'drop_upload', dialogClass: 'drop_upload',
...@@ -846,6 +802,52 @@ ...@@ -846,6 +802,52 @@
modal: true, modal: true,
autoOpen: false autoOpen: false
}); });
$('#deck_share').click(function() {
return $("#deck_share_dialog").dialog('open');
});
$('#deck_url_shorten').click(function() {
$('#deck_url_shorten').attr("disabled", true);
return $.ajax({
url: 'https://www.googleapis.com/urlshortener/v1/url',
type: 'POST',
data: JSON.stringify({
longUrl: decks.deck().url()
}),
contentType: 'application/json; charset=utf-8',
success: function(data) {
$("#deck_url").val(data.id);
$("#deck_url")[0].select();
return $('#deck_url_shorten').attr("disabled", false);
}
});
});
$('#deck_load').change(function() {
return decks.upload(this.files);
});
window.addEventListener('popstate', function(ev) {
if (ev.state) {
return deck.refresh(ev.state, false);
}
});
$('.main_div').bind('dragover', function(ev) {
$("#drop_upload_dialog").dialog('open');
return false;
});
$("#drop_upload_dialog").bind('drop', function(ev) {
$("#drop_upload_dialog").dialog('close');
decks.upload(event.dataTransfer.files);
return false;
});
$(".rename_ope").click(function() {
$(".text,.graphic").toggleClass("graphic text");
return decks.render();
});
$.i18n.properties({
name: 'card',
path: '/locales/',
mode: 'map',
cache: true
});
return addthis.init(); return addthis.init();
}); });
......
decks/new/index.html
View file @ e9a94aed
...@@ -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