tidy up...

martin-pabst · martin-pabst · commit c0dd8d7bc96a · 2025-09-21T20:27:45.000+02:00
diff --git a/include/graphics/grid.svg b/include/graphics/grid.svg
@@ -0,0 +1,56 @@
+<svg width="105" height="105" viewBox="0 0 105 105" xmlns="http://www.w3.org/2000/svg" fill="#fff">
+    <circle cx="12.5" cy="12.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="0s" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="12.5" cy="52.5" r="12.5" fill-opacity=".5">
+        <animate attributeName="fill-opacity"
+         begin="100ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="52.5" cy="12.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="300ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="52.5" cy="52.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="600ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="92.5" cy="12.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="800ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="92.5" cy="52.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="400ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="12.5" cy="92.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="700ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="52.5" cy="92.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="500ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+    <circle cx="92.5" cy="92.5" r="12.5">
+        <animate attributeName="fill-opacity"
+         begin="200ms" dur="1s"
+         values="1;.2;1" calcMode="linear"
+         repeatCount="indefinite" />
+    </circle>
+</svg>
diff --git a/src/client/embedded/MainEmbedded.ts b/src/client/embedded/MainEmbedded.ts
@@ -24,6 +24,8 @@ import { EmbeddedSlider } from "./EmbeddedSlider.js";
 import { JOScript } from "./EmbeddedStarter.js";
 import { WriteQueryManager } from "./WriteQueryManager.js";
 
+import gridUrl from '/include/graphics/grid.svg';
+
 import jQuery from "jquery";
 
 type JavaOnlineConfig = {
@@ -606,16 +608,13 @@ export class MainEmbedded implements MainBase {
 
     makeWaitDiv(): JQuery<HTMLElement> {
 
-        //@ts-ignore
-        let url = (window.javaOnlineDir == null ? '' : window.javaOnlineDir) + 'assets/graphics/grid.svg';
-
         let waitHtml = `
         <div class="bitteWarten">
         <div style="margin-bottom: 30px">
             <div class="bitteWartenText" style="font-size: 20px"></div>
         </div>
         <div>
-            <img src="${url}" alt="" style="height: 40px">
+            <img src="${gridUrl}" alt="" style="height: 40px">
         </div>
         <div class="bitteWartenProgress" style="font-size: 20px"></div>
         </div>
diff --git a/src/client/sqljs-worker/DatabaseTools.ts b/src/client/sqljs-worker/DatabaseTools.ts
@@ -80,14 +80,6 @@ export class DatabaseTool {
 
         let t = performance.now();
 
-        // console.log("Starting worker...");
-
-        // let url: string = "worker/sqljs-worker.js"
-        // if(this.main.isEmbedded()){
-        //     //@ts-ignore
-        //     url = window.javaOnlineDir + url;
-        // }
-
         // @ts-ignore
         if(window.jo_doc){
             // In embedded mode inside iframe the calling domain is different, so web workers are not supported
diff --git a/tsconfig_development-tools.json b/tsconfig_development-tools.json
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,4 +1,4 @@
-import { searchForWorkspaceRoot, type UserConfig } from 'vite'
+import { type UserConfig } from 'vite'
 import commonConfig from './vite.config-common.ts'
 
 export default {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { searchForWorkspaceRoot, type UserConfig } from 'vite'`
	`1`	`+import { type UserConfig } from 'vite'`
`2`	`2`	`import commonConfig from './vite.config-common.ts'`
`3`	`3`
`4`	`4`	`export default {`