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

src/static/js/admin/plugins.js

@@ -1,5 +1,16 @@
 $(document).ready(function () {
-  var socket = io.connect().of("/pluginfw/installer");
+  
+  var socket,
+    loc = document.location,
+    port = loc.port == "" ? (loc.protocol == "https:" ? 443 : 80) : loc.port,
+    url = loc.protocol + "//" + loc.hostname + ":" + port + "/",
+    pathComponents = location.pathname.split('/'),
+    // Strip admin/plugins/
+    baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/',
+    resource = baseURL.substring(1) + "socket.io";
+
+  //connect
+  socket = io.connect(url, {resource : resource}).of("/pluginfw/installer");
 
   $('.search-results').data('query', {
     pattern: '',

src/static/js/pad.js

@@ -203,8 +203,7 @@ function handshake()
   //create the url
   var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
   //find out in which subfolder we are
-  var resource = exports.baseURL + "socket.io";
-  
+  var resource =  exports.baseURL.substring(1)  + "socket.io";
   //connect
   socket = pad.socket = io.connect(url, {
     resource: resource,

src/templates/pad.html

@@ -280,8 +280,12 @@
             var clientVars = {};
             (function () {
               
-              var baseURL = '../';
               
+              var pathComponents = location.pathname.split('/');
+              
+              // Strip 'p' and the padname from the pathname and set as baseURL
+              var baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/';
+                            
               require.setRootURI(baseURL + "javascripts/src");
               require.setLibraryURI(baseURL + "javascripts/lib");
               require.setGlobalKeyPath("require");

src/templates/timeslider.html

@@ -134,7 +134,12 @@
   var clientVars = {};
   
   (function () {
-    var baseURL = '../../';
+    
+    var pathComponents = location.pathname.split('/');
+    
+    // Strip 'p', the padname and 'timeslider' from the pathname and set as baseURL
+    var baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/';
+    
     
     require.setRootURI(baseURL + "javascripts/src");
     require.setLibraryURI(baseURL + "javascripts/lib");