public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

pull/840/merge
johnyma22 2012-04-29 19:13:51 +01:00
parent e33b131696 bf568b3477
commit e5ffe77af5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/js/admin/plugins.js
View File

@ -5,8 +5,8 @@ $(document).ready(function () {
port = loc.port == "" ? (loc.protocol == "https:" ? 443 : 80) : loc.port, port = loc.port == "" ? (loc.protocol == "https:" ? 443 : 80) : loc.port,
url = loc.protocol + "//" + loc.hostname + ":" + port + "/", url = loc.protocol + "//" + loc.hostname + ":" + port + "/",
pathComponents = location.pathname.split('/'), pathComponents = location.pathname.split('/'),
// Strip admin/plugins/ // Strip admin/plugins
baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/', baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/',
resource = baseURL.substring(1) + "socket.io"; resource = baseURL.substring(1) + "socket.io";
//connect //connect