Skip to content

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

rooms_show

parent 4598f034
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
assets/javascripts/room_show.coffee
View file @ 05dd3d50
...@@ -59,7 +59,7 @@ $('#join').click -> ...@@ -59,7 +59,7 @@ $('#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) 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' 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) $('#room_url').val mycard.room_url room.server.ip,room.server.port,mycard.room_name(room.name, room.password), null, null, room._private, room.server.auth
$('#share').modal() $('#share').modal()
$('#room_url').focus() $('#room_url').focus()
$('#room_url').select() $('#room_url').select()
\ No newline at end of file
assets/javascripts/room_show.js
View file @ 05dd3d50
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
}); });
if (location.hash === '#share') { 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))); $('#room_url').val(mycard.room_url(room.server.ip, room.server.port, mycard.room_name(room.name, room.password), null, null, room._private, room.server.auth));
$('#share').modal(); $('#share').modal();
$('#room_url').focus(); $('#room_url').focus();
$('#room_url').select(); $('#room_url').select();
......
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