Refactoring the base url capture function

Victor Costa
1 parent 13e18eaf
Showing 2 changed files with 4 additions and 19 deletions Show diff stats
index.html
js/requirejs-config.js
@@ -15,29 +15,15 @@
       var Url = (function(){
         return {
-
           initBase: function(){
-            var base = window.location.href;
-            var host = window.location.host;
-            var regex = new RegExp(".*" + host + '/', "g");
-
-            if(host){
-              base = base.replace(regex,'');
-            }else{
-              base = base.replace('index.html','');
-            }
-            return base
-          },
-          removeUrlParameters: function(full_url){
-            var url_base = full_url.split('#').shift();
-            return url_base;
+            return "//" + window.location.host + window.location.pathname.replace('/index.html','');
           },
-           addBaseUrl: function(filename){
+          addBaseUrl: function(filename){
             var base = window.location.href;
             if(base.match(/file:/) || filename.match(/http:/)){
               base = '';
             }else{
-              base = this.removeUrlParameters(base) + '/';
+              base = this.initBase() + '/';
             }
             return base + filename;
           }
 if(window.Url){
-  var base = Url.initBase();
-  base = Url.removeUrlParameters(base) + '/js/';
+  var base = Url.initBase() + '/js/';
 }else{
   base = '../js'
 }
1	if(window.Url){	1	if(window.Url){
2	- var base = Url.initBase();
3	- base = Url.removeUrlParameters(base) + '/js/';	2	+ var base = Url.initBase() + '/js/';
4	}else{	3	}else{
5	base = '../js'	4	base = '../js'
6	}	5	}