From 7c1f1a9cef7cc183e9516f5335eee3cf45cf6819 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 22 May 2017 13:44:48 +0200 Subject: [PATCH] Revert recording file format changes Change back to the old, non-modular recording file format. The new method doesn't work reliably and there are existing recordings already out there that we might want to handle. --- tests/playback-ui.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/playback-ui.js b/tests/playback-ui.js index 4d79d17f..b5fac90f 100644 --- a/tests/playback-ui.js +++ b/tests/playback-ui.js @@ -19,10 +19,17 @@ function loadFile() { } message("Loading " + fname); - return import(`../recordings/${fname}#nocache`); + + return new Promise(function (resolve, reject) { + var script = document.createElement("script"); + script.onload = resolve; + script.onerror = reject; + document.body.appendChild(script); + script.src = "../recordings/" + fname; + }); } -function enableUI(recording) { +function enableUI() { var iterations = WebUtil.getQueryVar('iterations', 3); document.getElementById('iterations').value = iterations; @@ -33,14 +40,14 @@ function enableUI(recording) { document.getElementById('mode1').checked = true; } - message("VNC_frame_data.length: " + recording.VNC_frame_data.length); + message("VNC_frame_data.length: " + VNC_frame_data.length); const startButton = document.getElementById('startButton'); startButton.disabled = false; startButton.addEventListener('click', start); - frames = recording.VNC_frame_data; - encoding = recording.VNC_frame_encoding; + frames = VNC_frame_data; + encoding = VNC_frame_encoding; } const notification = function (rfb, mesg, level, options) { @@ -171,4 +178,4 @@ function start() { player.start(mode); } -loadFile().then(enableUI).catch(message); +loadFile().then(enableUI).catch(function (e) { message("Error loading recording"); });