Merge pull request #59 from simon-p-r/absolutePath

Remove hoek.isAbsolutePath for path.isAbsolute
hapijs · May 9, 2016 · 9607ea4 · 9607ea4
2 parents 4e3ec4d + 3c4cd57
commit 9607ea4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/directory.js b/lib/directory.js
@@ -39,7 +39,7 @@ exports.handler = function (route, options) {
         for (let i = 0; i < paths.length; ++i) {
             let path = paths[i];
 
-            if (!Hoek.isAbsolutePath(path)) {
+            if (!Path.isAbsolute(path)) {
                 path = Path.join(route.settings.files.relativeTo, path);
             }
 

diff --git a/lib/file.js b/lib/file.js
@@ -59,7 +59,7 @@ exports.response = function (path, options, request, _preloaded) {
     Hoek.assert(!options.mode || ['attachment', 'inline'].indexOf(options.mode) !== -1, 'options.mode must be either false, attachment, or inline');
 
     const source = {
-        path: Path.normalize(Hoek.isAbsolutePath(path) ? path : Path.join(request.route.settings.files.relativeTo, path)),
+        path: Path.normalize(Path.isAbsolute(path) ? path : Path.join(request.route.settings.files.relativeTo, path)),
         settings: options,
         stat: null,
         fd: null