Rewire the pushState router, by always passing a REBASE parameter. Fi…

…x associated video URL.
pydio · Nov 15, 2014 · 57f30ad · 57f30ad
1 parent c1f45a9
commit 57f30ad
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 17 deletions.
diff --git a/core/src/plugins/editor.video/class.VideoPreviewer.js b/core/src/plugins/editor.video/class.VideoPreviewer.js
@@ -106,6 +106,9 @@ preload="auto" width="#{WIDTH}" height="#{HEIGHT}" data-setup="{}">\n\
 			}
             if($$('base').length){
                 url = $$("base")[0].getAttribute("href");
+                if(!url.startsWith('http') && !url.startsWith('https')){
+                    url = document.location.origin + url;
+                }
             }
 
             var html5proxies = $H({});

diff --git a/core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php b/core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php
@@ -141,13 +141,21 @@ public function switchAction($action, $httpVars, $fileVars)
                 }
 
                 $root = $_SERVER['REQUEST_URI'];
-                if(basename($root) == "dashboard" || basename($root) == "settings" || basename($root) == "welcome" || strpos(basename($root), "ws-") === 0){
-                    $root = dirname($root);
+                $configUrl = ConfService::getCoreConf("SERVER_URL");
+                if(!empty($configUrl)){
+                    $root = '/'.ltrim(parse_url($configUrl, PHP_URL_PATH), '/');
+                }else{
+                    preg_match ('/ws-(\w)*\/|settings|dashboard|welcome/', $root, $matches, PREG_OFFSET_CAPTURE);
+                    if(count($matches)){
+                        $capture = $matches[0][1];
+                        $root = substr($root, 0, $capture);
+                    }
                 }
                 $START_PARAMETERS = array(
-                    "BOOTER_URL"=>"index.php?get_action=get_boot_conf",
-                    "MAIN_ELEMENT" => "ajxp_desktop",
-                    "APPLICATION_ROOT" => $root
+                    "BOOTER_URL"        =>"index.php?get_action=get_boot_conf",
+                    "MAIN_ELEMENT"      => "ajxp_desktop",
+                    "APPLICATION_ROOT"  => $root,
+                    "REBASE"            => $root
                 );
                 if (AuthService::usersEnabled()) {
                     AuthService::preLogUser((isSet($httpVars["remote_session"])?$httpVars["remote_session"]:""));

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js
@@ -135,12 +135,12 @@ Class.create("Ajaxplorer", {
         var appRoot = ajxpBootstrap.parameters.get('APPLICATION_ROOT');
         if(appRoot && appRoot != "/"){
             Backbone.history.start({
-                pushState: false,
+                pushState: true,
                 root:appRoot
             });
         }else{
             Backbone.history.start({
-                pushState: false
+                pushState: true
             });
         }
         var navigate = function(repList, repId){

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
diff --git a/core/src/plugins/gui.ajax/res/js/lib/prototype/prototype.js b/core/src/plugins/gui.ajax/res/js/lib/prototype/prototype.js
@@ -2390,12 +2390,16 @@ Element.Methods = {
       return styles.include('opacity') ?
         element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
     }
-    for (var property in styles)
-      if (property == 'opacity') element.setOpacity(styles[property]);
-      else
-        elementStyle[(property == 'float' || property == 'cssFloat') ?
-          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
-            property] = styles[property];
+      try{
+        for (var property in styles)
+          if (property == 'opacity') element.setOpacity(styles[property]);
+          else
+            elementStyle[(property == 'float' || property == 'cssFloat') ?
+              (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
+                property] = styles[property];
+      }catch(invalid){
+          if(console) console.log('Invalid Styles', styles, element);
+      }
 
     return element;
   },
@@ -5752,7 +5756,9 @@ Form.EventObserver = Class.create(Abstract.EventObserver, {
     if (document.createEvent)
       element.dispatchEvent(event);
     else
-      element.fireEvent(event.eventType, event);
+        try{
+          element.fireEvent(event.eventType, event);
+        }catch(unspec){}
 
     return Event.extend(event);
   }

diff --git a/core/src/plugins/gui.ajax/res/js/lib/prototype/splitter.js b/core/src/plugins/gui.ajax/res/js/lib/prototype/splitter.js
@@ -115,11 +115,12 @@ Class.create("Splitter", AjxpPane, {
         if(!this.initBorderB) this.initBorderB = 0;
 
 		this.splitbar = new Element('div', {unselectable:'on'});
+        var zIndex = (this.options.invisibleBar?parseInt(this.group.getStyle('zIndex'))+1:'inherit') || '10000';
 		this.splitbar.addClassName(this.options.splitbarClass).setStyle({
             position:'absolute',
             cursor:this.options.cursor,
             fontSize:'1px',
-            zIndex:(this.options.invisibleBar?parseInt(this.group.getStyle('zIndex'))+1:'inherit')
+            zIndex:zIndex
         });
 		this.paneA.insert({after:this.splitbar});