fix

YahooArchive · Oct 29, 2015 · 9370e7e · 9370e7e
1 parent 51f7322
commit 9370e7e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/lib/urlResolver.js b/src/lib/urlResolver.js
@@ -47,16 +47,20 @@ x.yUrlResolver = function (schemes) {
                 auth, hostname, port) + path;
         },
         relCallback: function(path) {
-            var pos = -1, bPath = _baseURL[2];
+            var pos = -1, hashPos = -1, bPath = _baseURL[2];
             if (path.length === 0) {
                 return _baseURL[0] + bPath;
             }
             switch(path.charCodeAt(0)) {
                 case 47: case 92: /* / or \ */ 
                     return _baseURL[0] + path;
                 case 63: /* ? */
-                    (pos = bPath.indexOf('?')) === -1 && 
-                    (pos = bPath.indexOf('#')); break;
+                    pos = bPath.indexOf('?');
+                    hashPos = bPath.indexOf('#');
+                    if (pos === -1 || hashPos !== -1 && hashPos < pos) {
+                        pos = hashPos;
+                    }
+                    break;
                 case 35: /* # */
                     pos = bPath.indexOf('#'); break;
                 default: // else