Merge branch 'master' into coolloading

1 files changed, 5 insertions, 6 deletions

diff --git a/webAO/ui.js b/webAO/ui.js
index 9e95be9..0baad1d 100644
--- a/webAO/ui.js
+++ b/webAO/ui.js
@@ -1,7 +1,6 @@
 /* eslint indent: ["error", 2] */
 
-// import GoldenLayout from "./golden/js/goldenlayout.js";
-import GoldenLayout from 'golden-layout';
+import { GoldenLayout } from "golden-layout";
 
 const config = {
   settings: {
@@ -67,12 +66,12 @@ const config = {
   }],
 };
 
-const golden = new GoldenLayout(config);
-golden.registerComponent('template', (container, componentState) => {
+const golden = new GoldenLayout();
+golden.registerComponentFactoryFunction('template', (container, componentState) => {
   const template = document.querySelector(`#${componentState.id}`);
-  container.getElement().html(template.content);
+  container.element.innerHTML = template.innerHTML;
   // TODO: support multiple locales
   // container.setTitle(document.querySelector(`#${componentState.id} meta[name='frame-title']`).getAttribute("content"));
 });
+golden.loadLayout(config)
 
-golden.init();