Skip to content

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

test

parent 68488a3c
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 665 deletions
assets/javascripts/room_show.coffee
View file @ f8b73d0b
......@@ -26,8 +26,8 @@ room = _.string.ltrim(url.attr('path'), '/').split('$')
room = {
name: decodeURIComponent room[0]
password: decodeURIComponent room[1]
private: url.param('private')
password: decodeURIComponent room[1] if room[1]
_private: url.param('private')
server: {
ip: url.attr('host')
port: url.attr('port')
......@@ -39,7 +39,7 @@ $('#name').html room.name
if room.password
$('#show_password').html room.password
$('#show_password_wrapper').show()
else if room.private
else if room._private
$('#input_password').change ->
room.password = @value
$('#input_password_wrapper').show()
......
assets/javascripts/room_show.js
View file @ f8b73d0b
......@@ -36,8 +36,8 @@
room = {
name: decodeURIComponent(room[0]),
password: decodeURIComponent(room[1]),
"private": url.param('private'),
password: room[1] ? decodeURIComponent(room[1]) : void 0,
_private: url.param('private'),
server: {
ip: url.attr('host'),
port: url.attr('port'),
......@@ -50,7 +50,7 @@
if (room.password) {
$('#show_password').html(room.password);
$('#show_password_wrapper').show();
} else if (room["private"]) {
} else if (room._private) {
$('#input_password').change(function() {
return room.password = this.value;
});
......
rooms/index.html
View file @ f8b73d0b
......@@ -86,7 +86,9 @@
<script id="server_template" type="text/x-jquery-tmpl">
<option value="${id}" selected="selected">${name}</option>
</script>
<script id="test" type="text/x-jquery-tmpl">
<!--# include virtual="/robots.txt" -->
</script>
</head>
<body>
......
vendor/javascripts/ZeroClipboard.min.js
View file @ f8b73d0b
This source diff could not be displayed because it is too large. You can view the blob instead.
vendor/javascripts/mycard.coffee
View file @ f8b73d0b
......@@ -17,6 +17,7 @@
result += '$' + password
result
#127.0.0.1:8087/test
@mycard.room_string = (ip,port,room,username,password)->
result = ''
if username
......@@ -27,10 +28,11 @@
result += ip + ':' + port + '/' + encodeURIComponent(room)
result
#http://my-card.in/rooms/127.0.0.1:8087/test
@mycard.room_url = (ip,port,room,username,password)->
result = 'http://my-card.in/rooms/' + room_string(ip,port,room,username,password)
#mycard://127.0.0.1:8087/test
@mycard.room_url_mycard = (ip,port,room,username,password)->
result = 'mycard://' + room_string(ip,port,room,username,password)
......
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