Merge pull request #20 from saymedia/mimicUrlResolve

Mimic the behavior of UrlResolve
saymedia · Apr 16, 2015 · 6e280d1 · 6e280d1
2 parents 2e55127 + 45c1d85
commit 6e280d1
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/ngoverrides.js b/lib/ngoverrides.js
@@ -586,7 +586,16 @@ function registerModule(context) {
                     }
 
                     var baseUrl = serverRequestContext.location.absUrl();
-                    var normalizedVal = url.resolve(baseUrl, uri);
+
+                    // mimic the behavior of UrlResolve
+                    var normalizedVal;
+                    if (uri === null) {
+                        normalizedVal = url.resolve(baseUrl, '/null');
+                    }
+                    else {
+                        normalizedVal = url.resolve(baseUrl, uri);
+                    }
+
                     if (normalizedVal !== '' && !normalizedVal.match(regex)) {
                         return 'unsafe:' + normalizedVal;
                     }