diff --git a/src/js/src/bookmark/main.js b/src/js/src/bookmark/main.js
index 777df6c..a211766 100644
--- a/src/js/src/bookmark/main.js
+++ b/src/js/src/bookmark/main.js
@@ -1,4 +1,4 @@
-import { Graphviz } from "/solitude/libs/@hpcc-js/wasm/dist/index.js";
+import { Graphviz } from "./js/@hpcc-js/wasm/dist/index.js";
(function () {
window.addEventListener("load", boot);
diff --git a/src/js/src/main/app.html b/src/js/src/main/app.html
index 1e89cc8..0891300 100644
--- a/src/js/src/main/app.html
+++ b/src/js/src/main/app.html
@@ -6,6 +6,102 @@
Solitude
+
diff --git a/src/js/src/main/app.js b/src/js/src/main/app.js
index 94fb8a7..1f10b8c 100644
--- a/src/js/src/main/app.js
+++ b/src/js/src/main/app.js
@@ -4,12 +4,13 @@
window.addEventListener('load', main(document));
function main(document) {
+ const kernelLogger = window.kernelLogger
+ kernelLogger.info("main started");
graftSolitude(window);
webconfig(window);
- var mysolitude;
- if (true || (typeof solitude.style) === 'undefined') {
- mysolitude = readyWeb();
- }
+ const mysolitude = window.solitude;
+ mysolitude.apps = {};
+ Object.assign(mysolitude.apps, window.tmp.solitudeapps);
//アプリケーション毎に初期化操作
initializeSolitudeApps(mysolitude.apps)
@@ -30,7 +31,9 @@
})
toggleMenuItem(Que("#main").get());
- })
+ });
+ kernelLogger.debug("flush !");
+ kernelLogger.flush();
// 以下、宣言
function toggleMenuItem(element) {
@@ -63,17 +66,6 @@
content.classList.add("selected");
}
- /**
- * solitude web版でのsolitudeオブジェクトの組み立てを行う
- */
- function readyWeb() {
- //先にwebconfigを起動している前提
- const solitude = window.solitude;
- solitude.apps = {};
- Object.assign(solitude.apps, window.tmp.solitudeapps);
- return solitude;
- }
-
function initializeSolitudeApps(apps) {
const appsProto = {
useMenu: true,
@@ -112,7 +104,7 @@
if(app) {
app.instanceID = ++appInstanceID;
app.load();
- solitude.log.info("loaded " + name +", instanceID " + app.instanceID )
+ kernelLogger.info("loaded ".concat(name, ", instanceID ", app.instanceID ));
}
}
@@ -155,7 +147,7 @@
addNewTab(app);
addNewContent(app);
- solitude.log.info(app.name + " is initialized");
+ kernelLogger.info(app.name + " is initialized");
});
mount.que("li.init").get().classList.remove("init");
}