Revize 5da25123

JS apps are loaded as ES6 modules

sources/src/main/webapp/js/app.js

@@ -19 +19 @@
 		throw new AbstractMethodError;
 	}
 }
+
+export default App;

sources/src/main/webapp/js/showGraphApp.js

@@ +1 @@
+import App from './app.js';
+
 /**
  * Application running on the ShowGraph page.
  */
@@ -188 +190 @@
 		}
 	}
 }
+
+export default ShowGraphApp;

sources/src/main/webapp/js/uploadFilesApp.js

@@ +1 @@
+import App from './app.js';
+
 /**
- * Application running on the Upload files page.
- * @constructor
+ * Application running on the UploadFiles page.
  */
 class UploadFilesApp extends App {
 	/**
@@ -134 +135 @@
 		}
 	}
 }
+
+export default UploadFilesApp;

sources/src/main/webapp/showGraph.jsp

@@ -71 +71 @@
 
 		<script src="js/constants.js"></script>
 
-		<script src="js/app.js"></script>
-		<script src="js/showGraphApp.js"></script>
-
 		<title>IMiGEr</title>
 	</head>
 
@@ -85 +82 @@
 				<p>Loading graph...</p>
 			</div>
 		</div>
+		<script type="module">
+			import ShowGraphApp from './js/showGraphApp.js';
 
-		<script>
-			const app = new ShowGraphApp('${APP_NAME}', '${APP_HOME_URL}');
+			window.app = new ShowGraphApp('${APP_NAME}', '${APP_HOME_URL}');
 
 			document.addEventListener('DOMContentLoaded', () => {
 				app.run('${param.diagramId}');

sources/src/main/webapp/uploadFiles.jsp

@@ -32 +32 @@
 
 		<script src="js/constants.js"></script>
 
-		<script src="js/app.js"></script>
-		<script src="js/uploadFilesApp.js"></script>
-
 		<title>${APP_NAME}</title>
 	</head>
 
@@ -108 +105 @@
 			</div>
 		</main>
 	
-		<script>
-			const app = new UploadFilesApp('${APP_NAME}', '${APP_HOME_URL}');
+		<script type="module">
+			import UploadFilesApp from './js/uploadFilesApp.js';
+	
+			window.app = new UploadFilesApp('${APP_NAME}', '${APP_HOME_URL}');
 
 			document.addEventListener('DOMContentLoaded', () => {
 				app.run();