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

Merge branch 'master' of git://github.com/Pita/etherpad-lite into newDesignTest

Browse source
This commit is contained in:
John McLear 2011-08-01 23:13:51 +01:00
commit 143369b387
7 changed files with 299 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

2
static/index.html
View file

@ -125,6 +125,6 @@
}
//start the costum js
if(costumStart) costumStart();
if(typeof costumStart == "function") costumStart();
</script>
</html>

2
static/js/pad2.js
View file

@ -30,7 +30,7 @@ $(document).ready(function()
}
//start the costum js
if(costumStart) costumStart();
if(typeof costumStart == "function") costumStart();
handshake();
});

2
static/timeslider.html
View file

@ -58,7 +58,7 @@
$(document).ready(function ()
{
//start the costum js
if(costumStart) costumStart();
if(typeof costumStart == "function") costumStart();
//get the padId out of the url
var urlParts= document.location.pathname.split("/");