From b62623370a90a467cfad4b7e37137de7bf0d6a75 Mon Sep 17 00:00:00 2001 From: Eric van der Vlist Date: Sun, 2 May 2021 00:06:36 +0200 Subject: [PATCH] Cosmetics... --- oxygen/js-require/commons.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/oxygen/js-require/commons.js b/oxygen/js-require/commons.js index 92a7d4d..31a4b6b 100644 --- a/oxygen/js-require/commons.js +++ b/oxygen/js-require/commons.js @@ -5,18 +5,19 @@ * */ -/* - * Shortcuts aka imports +/* + * Shortcuts (aka imports) */ out = Packages.java.lang.System.out; CommonsOperationsUtil = Packages.ro.sync.ecss.extensions.commons.operations.CommonsOperationsUtil; -/* +/* * Function require - * + * */ require = function (filepath) { + // Check if the object has been initialized if (Object.keys(require).length == 0) { var currentPath = CommonsOperationsUtil.expandAndResolvePath(authorAccess, 'commons.js'); @@ -25,6 +26,7 @@ require = function (filepath) { }; require.urisSet[currentPath] = true; } + var currentFilePath = require.urisStack[require.urisStack.length - 1]; var currentURI = new java.net.URI(currentFilePath); var targetURI = currentURI.resolve(filepath); @@ -34,10 +36,9 @@ require = function (filepath) { require.urisSet[filepath] = true; var uri = new java.net.URI(filepath); out.println('Including ' + uri.toString()); - var text = new java.lang.String(java.nio.file.Files.readAllBytes( java.nio.file.Paths.get(targetURI) )); + var text = new java.lang.String(java.nio.file.Files.readAllBytes(java.nio.file.Paths. get (targetURI))); text = String(text); eval(text); require.urisStack.pop(); } } -