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

candy

parent 78eb4172
...@@ -31,16 +31,17 @@ class Rooms extends Spine.Controller ...@@ -31,16 +31,17 @@ class Rooms extends Spine.Controller
$(document).ready -> $(document).ready ->
Candy.init('/http-bind/', if true #for debug
core: Candy.init('/http-bind/',
debug: false, core:
autojoin: ['mycard@conference.my-card.in'], debug: false,
view: autojoin: ['mycard@conference.my-card.in'],
resources: '/vendor/stylesheets/candy/', view:
language: 'cn' resources: '/vendor/stylesheets/candy/',
) language: 'cn'
if window.location.href.indexOf("candy") != -1 )
Candy.Core.connect('zh99998测试80@my-card.in', 'zh112998') Candy.Core.connect('zh99998测试80@my-card.in', 'zh112998') if window.location.href.indexOf("candy") != -1
$('#candy').show()
#$('#username').val '@my-card.in' #$('#username').val '@my-card.in'
#$('#username').focus() #$('#username').focus()
......
...@@ -79,18 +79,21 @@ ...@@ -79,18 +79,21 @@
$(document).ready(function() { $(document).ready(function() {
var new_room, rooms; var new_room, rooms;
Candy.init('/http-bind/', { if (true) {
core: { Candy.init('/http-bind/', {
debug: false, core: {
autojoin: ['mycard@conference.my-card.in'] debug: false,
}, autojoin: ['mycard@conference.my-card.in']
view: { },
resources: '/vendor/stylesheets/candy/', view: {
language: 'cn' resources: '/vendor/stylesheets/candy/',
language: 'cn'
}
});
if (window.location.href.indexOf("candy") !== -1) {
Candy.Core.connect('zh99998测试80@my-card.in', 'zh112998');
} }
}); $('#candy').show();
if (window.location.href.indexOf("candy") !== -1) {
Candy.Core.connect('zh99998测试80@my-card.in', 'zh112998');
} }
$('#new_room_dialog').dialog({ $('#new_room_dialog').dialog({
autoOpen: false, autoOpen: false,
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</div> </div>
<div style="clear:left;"></div> <div style="clear:left;"></div>
</div> </div>
<div id="candy" style="top:auto;height:260px;"></div> <div id="candy" style="top:auto;height:260px;display:none"></div>
<div id="new_room_dialog" style="display: none"> <div id="new_room_dialog" style="display: none">
<form id="new_room"> <form id="new_room">
......
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