merge of #369, https://github.com/wordnik/swagger-js/issues/74

dist/lib/swagger.js

@@ -1001,7 +1001,7 @@
             _results = [];
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
               param = _ref[_i];
-              if (type.toLowerCase() === "file") {
+              if (typeof type !== 'undefined' && type.toLowerCase() === "file") {
                 _results.push(param);
               }
             }

dist/swagger-ui.js

@@ -1281,13 +1281,24 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     SwaggerUi.prototype.buildUrl = function(base, url) {
-      var parts;
+      var endOfPath, parts;
       log("base is " + base);
-      parts = base.split("/");
-      base = parts[0] + "//" + parts[2];
       if (url.indexOf("/") === 0) {
+        parts = base.split("/");
+        base = parts[0] + "//" + parts[2];
         return base + url;
       } else {
+        endOfPath = base.length;
+        if (base.indexOf("?") > -1) {
+          endOfPath = Math.min(endOfPath, base.indexOf("?"));
+        }
+        if (base.indexOf("#") > -1) {
+          endOfPath = Math.min(endOfPath, base.indexOf("#"));
+        }
+        base = base.substring(0, endOfPath);
+        if (base.indexOf("/", base.length - 1) !== -1) {
+          return base + url;
+        }
         return base + "/" + url;
       }
     };

lib/swagger.js

@@ -1001,7 +1001,7 @@
             _results = [];
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
               param = _ref[_i];
-              if (type.toLowerCase() === "file") {
+              if (typeof type !== 'undefined' && type.toLowerCase() === "file") {
                 _results.push(param);
               }
             }

src/main/coffeescript/SwaggerUi.coffee

@@ -69,13 +69,20 @@ class SwaggerUi extends Backbone.Router
 
   buildUrl: (base, url) ->
     log "base is " + base
-    parts = base.split("/")
-    base = parts[0] + "//" + parts[2]
     if url.indexOf("/") is 0
+      parts = base.split("/")
+      base = parts[0] + "//" + parts[2]
       base + url
     else
-      base + "/" + url
+      endOfPath = base.length
-
+      if base.indexOf("?") > -1
+        endOfPath = Math.min(endOfPath, base.indexOf("?"))
+      if base.indexOf("#") > -1
+        endOfPath = Math.min(endOfPath, base.indexOf("#"))
+      base = base.substring(0, endOfPath);
+      if base.indexOf( "/", base.length - 1 ) isnt -1
+        return base + url
+      return base + "/" + url
 
   # Shows message on topbar of the ui
   showMessage: (data = '') ->