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

candy

parent 78eb4172
...@@ -31,6 +31,7 @@ class Rooms extends Spine.Controller ...@@ -31,6 +31,7 @@ class Rooms extends Spine.Controller
$(document).ready -> $(document).ready ->
if true #for debug
Candy.init('/http-bind/', Candy.init('/http-bind/',
core: core:
debug: false, debug: false,
...@@ -39,8 +40,8 @@ $(document).ready -> ...@@ -39,8 +40,8 @@ $(document).ready ->
resources: '/vendor/stylesheets/candy/', resources: '/vendor/stylesheets/candy/',
language: 'cn' language: 'cn'
) )
if window.location.href.indexOf("candy") != -1 Candy.Core.connect('zh99998测试80@my-card.in', 'zh112998') if window.location.href.indexOf("candy") != -1
Candy.Core.connect('zh99998测试80@my-card.in', 'zh112998') $('#candy').show()
#$('#username').val '@my-card.in' #$('#username').val '@my-card.in'
#$('#username').focus() #$('#username').focus()
......
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
$(document).ready(function() { $(document).ready(function() {
var new_room, rooms; var new_room, rooms;
if (true) {
Candy.init('/http-bind/', { Candy.init('/http-bind/', {
core: { core: {
debug: false, debug: false,
...@@ -92,6 +93,8 @@ ...@@ -92,6 +93,8 @@
if (window.location.href.indexOf("candy") !== -1) { 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');
} }
$('#candy').show();
}
$('#new_room_dialog').dialog({ $('#new_room_dialog').dialog({
autoOpen: false, autoOpen: false,
resizable: false, resizable: 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