From 14891696a54ec624ed46f34387497d9f8d9817ba Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 27 Aug 2012 11:05:55 -0500 Subject: [PATCH] Update require.coffee from CEF 1 atom --- src/stdlib/require.coffee | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/stdlib/require.coffee b/src/stdlib/require.coffee index 5de1c8af0..be7be3929 100644 --- a/src/stdlib/require.coffee +++ b/src/stdlib/require.coffee @@ -19,10 +19,12 @@ nakedLoad = (file) -> code = __read file window.eval(code + "\n//@ sourceURL=" + file) -require = (file, cb) -> - return cb require file if cb? +require = (path, cb) -> + return cb require path if cb? + + unless file = resolve(path) + throw new Error("Require can't find file at path '#{path}'") - file = resolve file parts = file.split '.' ext = parts[parts.length-1] @@ -88,10 +90,10 @@ resolve = (file) -> else file = __expand(file) or file - if file[0] isnt '/' - throw "require: Can't find '#{file}'" - - return file + if file[0] == '/' + file + else + null __expand = (path) -> return path if __isFile path