Commit 7d606ddb authored by 神楽坂玲奈's avatar 神楽坂玲奈

room name fix

parent 49d1340a
...@@ -51,10 +51,7 @@ login = (username, password)-> ...@@ -51,10 +51,7 @@ login = (username, password)->
CandyShop.InlineImages.init(); CandyShop.InlineImages.init();
Candy.View.Template.Login.form = $('#login_form_template').html() Candy.View.Template.Login.form = $('#login_form_template').html()
Candy.Util.setCookie('candy-nostatusmessages', '1', 365); Candy.Util.setCookie('candy-nostatusmessages', '1', 365);
Candy.Core.Event.Strophe.Login = ->
alert 1
Candy.Core.connect(username, password) Candy.Core.connect(username, password)
#window.onunload = window.onbeforeunload #window.onunload = window.onbeforeunload
...@@ -91,6 +88,7 @@ $(document).ready -> ...@@ -91,6 +88,7 @@ $(document).ready ->
new_room.start_lp.onchange = -> new_room.start_lp.onchange = ->
if @value != '8000' if @value != '8000'
new_room.pvp.checked = false new_room.pvp.checked = false
new_room.onsubmit = (ev)-> new_room.onsubmit = (ev)->
ev.preventDefault() ev.preventDefault()
$('#new_room_dialog').dialog('close') $('#new_room_dialog').dialog('close')
...@@ -116,7 +114,7 @@ $(document).ready -> ...@@ -116,7 +114,7 @@ $(document).ready ->
new_room.name.value = Math.floor Math.random() * 1000 new_room.name.value = Math.floor Math.random() * 1000
$('#new_room_dialog').dialog('open') $('#new_room_dialog').dialog('open')
$('#login_domain').combobox() #$('#login_domain').combobox()
$('#login_dialog').dialog $('#login_dialog').dialog
autoOpen:false, autoOpen:false,
......
...@@ -107,9 +107,6 @@ ...@@ -107,9 +107,6 @@
CandyShop.InlineImages.init(); CandyShop.InlineImages.init();
Candy.View.Template.Login.form = $('#login_form_template').html(); Candy.View.Template.Login.form = $('#login_form_template').html();
Candy.Util.setCookie('candy-nostatusmessages', '1', 365); Candy.Util.setCookie('candy-nostatusmessages', '1', 365);
Candy.Core.Event.Strophe.Login = function() {
return alert(1);
};
Candy.Core.connect(username, password); Candy.Core.connect(username, password);
window.onbeforeunload = null; window.onbeforeunload = null;
return $('#candy').show(); return $('#candy').show();
...@@ -182,7 +179,6 @@ ...@@ -182,7 +179,6 @@
new_room.name.value = Math.floor(Math.random() * 1000); new_room.name.value = Math.floor(Math.random() * 1000);
return $('#new_room_dialog').dialog('open'); return $('#new_room_dialog').dialog('open');
}); });
$('#login_domain').combobox();
$('#login_dialog').dialog({ $('#login_dialog').dialog({
autoOpen: false, autoOpen: false,
resizable: false, resizable: false,
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
<div id="new_room_dialog" style="display: none"> <div id="new_room_dialog" style="display: none">
<form id="new_room"> <form id="new_room">
<label for="new_room_name">房间名</label> <label for="new_room_name">房间名</label>
<input type="text" id="new_room_name"/><br/> <input type="text" id="new_room_name" name="name"/><br/>
<label for="new_room_password">房间密码</label> <label for="new_room_password">房间密码</label>
<input type="password" name="password" id="new_room_password" value=""/><br/> <input type="password" name="password" id="new_room_password" value=""/><br/>
<input type="checkbox" name="pvp" id="new_room_pvp" value="pvp"/><label for="new_room_pvp">竞技场</label> <input type="checkbox" name="pvp" id="new_room_pvp" value="pvp"/><label for="new_room_pvp">竞技场</label>
......
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