Commit 68488a3c authored by 神楽坂玲奈's avatar 神楽坂玲奈

clip

parent a95af905
...@@ -271,6 +271,8 @@ src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> ...@@ -271,6 +271,8 @@ src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
<script type="text/javascript" src="/vendor/candy/plugins/inline-images/candy.js"></script> <script type="text/javascript" src="/vendor/candy/plugins/inline-images/candy.js"></script>
<link rel="stylesheet" type="text/css" href="/vendor/candy/plugins/inline-images/candy.css"/> <link rel="stylesheet" type="text/css" href="/vendor/candy/plugins/inline-images/candy.css"/>
<script src="/vendor/javascripts/ZeroClipboard.min.js"></script>
<script src="/assets/javascripts/rooms.js"></script> <script src="/assets/javascripts/rooms.js"></script>
</body> </body>
</html> </html>
This diff is collapsed.
This diff is collapsed.
...@@ -17,12 +17,22 @@ ...@@ -17,12 +17,22 @@
result += '$' + password result += '$' + password
result result
@mycard.join = (ip,port,room,username,password)-> @mycard.room_string = (ip,port,room,username,password)->
result = 'mycard://' result = ''
if username if username
result += encodeURIComponent(username) result += encodeURIComponent(username)
if password if password
result += ':' + encodeURIComponent(password) result += ':' + encodeURIComponent(password)
result += '@' result += '@'
result += ip + ':' + port + '/' + encodeURIComponent(room) result += ip + ':' + port + '/' + encodeURIComponent(room)
window.location.href = result result
\ No newline at end of file
@mycard.room_url = (ip,port,room,username,password)->
result = 'http://my-card.in/rooms/' + room_string(ip,port,room,username,password)
@mycard.room_url_mycard = (ip,port,room,username,password)->
result = 'mycard://' + room_string(ip,port,room,username,password)
@mycard.join = (ip,port,room,username,password)->
window.location.href = room_url_mycard(ip,port,room,username,password)
\ No newline at end of file
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