From 8c62d1d222ffa99f147d6868cc0046ee11adf223 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 27 Jan 2022 17:24:08 +0300 Subject: [PATCH] now paths should work without issues on both U*NX systems and Windows... Signed-off-by: Alex A. Naanou --- Viewer/cfg/requirejs.js | 5 ++++- Viewer/doc/HACKS | 2 ++ Viewer/version.js | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Viewer/cfg/requirejs.js b/Viewer/cfg/requirejs.js index 9fbc6e12..1cb9dcd6 100644 --- a/Viewer/cfg/requirejs.js +++ b/Viewer/cfg/requirejs.js @@ -35,7 +35,10 @@ var setup = function(require, root){ (require.main ? require.main.filename.split(/[\\\/]/g).slice(0, -1).join('/') : document.baseURI - .replace(/^[a-zA-Z]+:\/\/\/?/, '') + // remove URL protocol... + .replace(/^[a-zA-Z]+:\/\/\/?/, '/') + // remove leading '/' on windows drives... + .replace(/^\/[a-zA-Z]:/, '') .split(/[#&]/)[0].split(/[\\\/]/g).slice(0, -1).join('/')) : '.', diff --git a/Viewer/doc/HACKS b/Viewer/doc/HACKS index c49f2c9f..6a17a6e1 100644 --- a/Viewer/doc/HACKS +++ b/Viewer/doc/HACKS @@ -11,6 +11,8 @@ Hacks and fixes - cfg/requirejs.js: .baseUrl calculation under U*IX systems needs a '/' prefixed... +Both issues are currently tweaked manually... + 20210122: diff --git a/Viewer/version.js b/Viewer/version.js index e149e4ac..804364ca 100644 --- a/Viewer/version.js +++ b/Viewer/version.js @@ -13,7 +13,7 @@ // > node version.js // - browser + requirejs + file:// // - browser + requirejs + http* -var VERSION = '4.0.0a' +var VERSION = '4.0.1a' //console.log(VERSION)