diff --git a/srv/CMakeLists.txt b/srv/CMakeLists.txt
index f5da26b..4d1ce91 100644
--- a/srv/CMakeLists.txt
+++ b/srv/CMakeLists.txt
@@ -19,7 +19,7 @@ set(JAVA_SCRIPT_FILES
static/js/terminal.js
static/js/utils.js
static/node_modules/xterm/lib/xterm.js
- static/node_modules/xterm-addon-search/out/SearchAddon.js)
+ static/node_modules/xterm-addon-search/lib/xterm-addon-search.js)
set(CSS_FILES static/css/basics.css static/css/genericrendering.css static/css/layout.css static/css/log.css
static/css/specifics.css static/node_modules/xterm/css/xterm.css)
set(IMG_FILES
diff --git a/srv/static/index.html b/srv/static/index.html
index 4326016..cf73037 100644
--- a/srv/static/index.html
+++ b/srv/static/index.html
@@ -8,16 +8,17 @@
+
+
+
+
+
-
-
-
-
diff --git a/srv/static/js/terminal.js b/srv/static/js/terminal.js
index d34133b..423075a 100644
--- a/srv/static/js/terminal.js
+++ b/srv/static/js/terminal.js
@@ -1,5 +1,9 @@
import * as AjaxHelper from './ajaxhelper.js';
+// workaround xtermjs not supporting ES6 modules yet (see https://github.com/xtermjs/xterm.js/issues/2878)
+const Terminal = exports.Terminal;
+const SearchAddon = exports.SearchAddon.SearchAddon;
+
/// \brief Returns a new terminal created via xterm.js.
export function makeTerminal()
{
@@ -16,11 +20,6 @@ export function makeTerminal()
export function addSearchToTerminal(terminal, targetElement)
{
const searchAddon = new SearchAddon();
- // FIXME: import the search addon correctly
- //import('../node_modules/xterm-addon-search/lib/xterm-addon-search.js').then(function(module) {
- // const searchAddon = new module.SearchAddon();
- // terminal.loadAddon(searchAddon);
- //});
terminal.loadAddon(searchAddon);
const searchInput = document.createElement('input');
diff --git a/srv/static/log.html b/srv/static/log.html
index 49d6217..cfce787 100644
--- a/srv/static/log.html
+++ b/srv/static/log.html
@@ -8,13 +8,15 @@
+
+
+
+
+
+
-
-
-
-