fix some baseUrl issues

GMOD · Aug 25, 2012 · 8ce5ec0 · 8ce5ec0
1 parent 98ceeda
commit 8ce5ec0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -20,6 +20,7 @@
                    JBrowse = new Browser({
                                            containerID: "GenomeBrowser",
                                            refSeqs: dataRoot + "/seq/refSeqs.json",
+                                           baseUrl: dataRoot+'/',
                                            include: [
                                              'jbrowse_conf.json',
                                              dataRoot + "/trackList.json"

diff --git a/src/JBrowse/Browser.js b/src/JBrowse/Browser.js
@@ -59,6 +59,8 @@ var Browser = function(params) {
     this.isInitialized = false;
 
     this.config = params;
+    if( ! this.config.baseUrl )
+        this.config.baseUrl = Util.resolveUrl( window.location.href, '.' ) + '/data/';
 
     this.startTime = Date.now();
 

diff --git a/src/JBrowse/Util.js b/src/JBrowse/Util.js
@@ -169,6 +169,8 @@ Util = {
 	    baseUrl = baseUrl.match(/.*\/\/[^\/]*/);
 	    return (baseUrl ? baseUrl[0] : '') + relativeUrl;
         }
+        // remove the query string from the base, if any
+        baseUrl = baseUrl.replace(/\?.*$/,'');
         //TODO: handle protocol relative urls:  ://www.domain.com
         baseUrl = baseUrl.substring(0,baseUrl.length - baseUrl.match(/[^\/]*$/)[0].length);// clean off the trailing path
         if (relativeUrl == '.')