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

room_share

parent 92ca2225
......@@ -56,4 +56,10 @@ if $.cookie('username') && $.cookie('password')
login($.cookie('username'), $.cookie('password'))
$('#join').click ->
mycard.join room.server.ip,room.server.port,mycard.room_name(room.name, room.password), $.cookie('username'), ($.cookie('password') if room.server.auth)
\ No newline at end of file
mycard.join room.server.ip,room.server.port,mycard.room_name(room.name, room.password), $.cookie('username'), ($.cookie('password') if room.server.auth)
if location.hash == '#share'
$('#room_url').val mycard.room_url room.server.ip,room.server.port,mycard.room_name(room.name, room.password), $.cookie('username'), ($.cookie('password') if room.server.auth)
$('#share').modal()
$('#room_url').focus()
$('#room_url').select()
\ No newline at end of file
// Generated by CoffeeScript 1.4.0
// Generated by CoffeeScript 1.6.2
(function() {
var login, matched, room, url;
......@@ -76,4 +76,11 @@
return mycard.join(room.server.ip, room.server.port, mycard.room_name(room.name, room.password), $.cookie('username'), (room.server.auth ? $.cookie('password') : void 0));
});
if (location.hash === '#share') {
$('#room_url').val(mycard.room_url(room.server.ip, room.server.port, mycard.room_name(room.name, room.password), $.cookie('username'), (room.server.auth ? $.cookie('password') : void 0)));
$('#share').modal();
$('#room_url').focus();
$('#room_url').select();
}
}).call(this);
input#room_url {width: 100%}
\ No newline at end of file
......@@ -16,6 +16,7 @@
}
</style>
<link href="/vendor/stylesheets/bootstrap/bootstrap-responsive.min.css" rel="stylesheet">
<link href="/assets/stylesheets/room_show.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
......@@ -106,7 +107,7 @@
<p>需要本地安装了mycard才能自动加入房间,如果没有安装,请手动打开ygopro点联机模式填写上面的资料。</p>
<p><a class="btn"
href="https://github.com/zh99998/mycard/wiki/%E5%AF%B9%E6%88%98:%E7%9B%B4%E6%8E%A5%E8%BF%9E%E6%8E%A5#wiki-wrapper">手动直连教程 &raquo;</a>
href="https://github.com/mycard/mycard/wiki/%E5%AF%B9%E6%88%98:%E7%9B%B4%E6%8E%A5%E8%BF%9E%E6%8E%A5#wiki-wrapper">手动直连教程 &raquo;</a>
</p>
</div>
<div class="span4">
......@@ -131,7 +132,19 @@
<footer>
<p>&copy; Mycard 2013</p>
</footer>
<div id="share" class="modal hide fade">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>约战</h3>
</div>
<div class="modal-body">
<p>按Ctrl+C复制房间地址,并发送给你的好友</p>
<input id="room_url"/>
</div>
<div class="modal-footer">
<a href="#" class="btn btn-primary" data-dismiss="modal">确定</a>
</div>
</div>
</div>
<!-- /container -->
......
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