Commit 8e6b9fc6 authored by 神楽坂玲奈's avatar 神楽坂玲奈

wait for i18n

parent e4ee0e23
...@@ -137,6 +137,12 @@ $(document).ready -> ...@@ -137,6 +137,12 @@ $(document).ready ->
cards_encoded = $.url().param('cards') cards_encoded = $.url().param('cards')
$('img#qrcode').attr('src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent("http://my-card.in/decks/?name=#{name}&cards=#{cards_encoded}")) $('img#qrcode').attr('src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent("http://my-card.in/decks/?name=#{name}&cards=#{cards_encoded}"))
$('#name').html(name) $('#name').html(name)
deck = new Deck(el: $("#deck")) $.i18n.properties
deck.tab_control() name:'card'
deck.parse cards_encoded path:'/locales/'
\ No newline at end of file mode:'map'
cache:true
callback: ->
deck = new Deck(el: $("#deck"))
deck.tab_control()
deck.parse cards_encoded
\ No newline at end of file
...@@ -321,16 +321,25 @@ ...@@ -321,16 +321,25 @@
})(Spine.Controller); })(Spine.Controller);
$(document).ready(function() { $(document).ready(function() {
var cards_encoded, deck, name; var cards_encoded, name;
name = $.url().param('name'); name = $.url().param('name');
cards_encoded = $.url().param('cards'); cards_encoded = $.url().param('cards');
$('img#qrcode').attr('src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent("http://my-card.in/decks/?name=" + name + "&cards=" + cards_encoded)); $('img#qrcode').attr('src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=' + encodeURIComponent("http://my-card.in/decks/?name=" + name + "&cards=" + cards_encoded));
$('#name').html(name); $('#name').html(name);
deck = new Deck({ return $.i18n.properties({
el: $("#deck") name: 'card',
path: '/locales/',
mode: 'map',
cache: true,
callback: function() {
var deck;
deck = new Deck({
el: $("#deck")
});
deck.tab_control();
return deck.parse(cards_encoded);
}
}); });
deck.tab_control();
return deck.parse(cards_encoded);
}); });
}).call(this); }).call(this);
...@@ -198,18 +198,8 @@ ...@@ -198,18 +198,8 @@
<script src="/assets/javascripts/decks.js"></script> <script src="/assets/javascripts/decks.js"></script>
<script src="/assets/javascripts/public.js"></script> <script src="/assets/javascripts/public.js"></script>
<script type="text/javascript"> <script type="text/javascript">
jQuery.i18n.properties({ /*$(document).ready(function () {
name:'card', $(".main_area").hScrollPane({
path:'/locales/',
mode:'map',
cache:true
});
$(document).ready(function () {
/*$(".main_area").hScrollPane({
mover:".press", //指定container对象下的哪个元素需要滚动位置 | 必传项; mover:".press", //指定container对象下的哪个元素需要滚动位置 | 必传项;
//showArrow:true, //指定是否显示左右箭头,默认不显示 | 可选项; //showArrow:true, //指定是否显示左右箭头,默认不显示 | 可选项;
//moverW:function(){return $(".press").width();}(), //传入水平滚动对象的长度值,不传入的话默认直接获取mover的宽度值 | 可选项; //moverW:function(){return $(".press").width();}(), //传入水平滚动对象的长度值,不传入的话默认直接获取mover的宽度值 | 可选项;
...@@ -218,10 +208,8 @@ ...@@ -218,10 +208,8 @@
//easing:true, //滚动是否需要滑动效果,默认有滑动效果 | 可选项; //easing:true, //滚动是否需要滑动效果,默认有滑动效果 | 可选项;
handleCssAlter:"draghandlealter", //指定拖动鼠标时滚动条的样式,不传入该参数则没有变化效果 | 可选项; handleCssAlter:"draghandlealter", //指定拖动鼠标时滚动条的样式,不传入该参数则没有变化效果 | 可选项;
mousewheel:{bind:false, moveLength:500} //mousewheel: bind->'true',绑定mousewheel事件; ->'false',不绑定mousewheel事件;moveLength是指定鼠标滚动一次移动的距离,默认值:{bind:true,moveLength:300} | 可选项; mousewheel:{bind:false, moveLength:500} //mousewheel: bind->'true',绑定mousewheel事件; ->'false',不绑定mousewheel事件;moveLength是指定鼠标滚动一次移动的距离,默认值:{bind:true,moveLength:300} | 可选项;
});*/ })
}); });;*/
</script> </script>
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. --> <!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<!--<script> <!--<script>
......
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