mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 14:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Merge 1e71d41b5f into 165f26947d

Browse source
This commit is contained in:
GitHub Merge Button 2012-01-22 06:25:39 -08:00
commit a5c1c2acdf
6 changed files with 65 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/index.html Normal file → Executable file
View file

@ -121,12 +121,12 @@
function go2Name()
{
var padname = document.getElementById("padname").value;
padname.length > 0 ? window.location = "p/" + padname : alert("Please enter a name")
padname.length > 0 ? window.location = window.location + "/p/" + padname : alert("Please enter a name")
}
function go2Random()
{
window.location = "p/" + randomPadName();
window.location = window.location + "/p/" + randomPadName();
}
function randomPadName()

3
static/js/pad2.js Normal file → Executable file
View file

@ -183,8 +183,9 @@ function handshake()
//find out in which subfolder we are
var resource = loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "socket.io";
//connect
console.log('create socket',url,resource)
socket = io.connect(url, {
resource: resource,
resource: 'socket.io',
'max reconnection attempts': 3
});

2
static/pad.html Normal file → Executable file
View file

@ -13,7 +13,7 @@
var clientVars = {};
// ]]>
</script>
<script src="../socket.io/socket.io.js"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="../minified/pad.js"></script>
<link href="../static/custom/pad.css" rel="stylesheet">
<script src="../static/custom/pad.js"></script>