From d64703072080894a788d37a965b4864f0ecc250b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20=E2=80=98Touky=E2=80=99=20Huet?= Date: Sat, 28 Sep 2013 11:00:30 +0000 Subject: [PATCH] MeshViewer html : added iframe and isolated nacl in another html. --- test/meshviewer_index.html | 26 +++++++++++++++++--------- test/meshviewer_nacl.html | 13 +++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 test/meshviewer_nacl.html diff --git a/test/meshviewer_index.html b/test/meshviewer_index.html index fc159058..ceac7c5f 100644 --- a/test/meshviewer_index.html +++ b/test/meshviewer_index.html @@ -29,10 +29,12 @@ textarea #id_div_progress { position: absolute; - top: 40%; + top: 20%; left: 30%; right: 30%; z-index: 3; + background-color:white; + border:1px solid #000000; } progress { @@ -95,6 +97,7 @@ progress::-webkit-progress-value g_div_progress_status = null; g_progress_bar = null; g_var_progress_bar = -1; + g_frame_embed = null; function GetNaClListenerDiv() { return document.getElementById('id_div_listener'); } function GetNaClModuleVar() { return g_embed_nacl_module; } @@ -105,6 +108,7 @@ progress::-webkit-progress-value function GetDivProgressStatus() { return g_div_progress_status; } function GetDivEmbedData() { return g_div_embed_data; } function GetDivEmbedDataSave() { return g_div_embed_data_save; } + function GetFrameData() { return g_frame_embed; } function IsUsingNaCl() { return true; } @@ -120,11 +124,19 @@ progress::-webkit-progress-value //Init should always start before the first tick window.setTimeout("Init()", 100); window.setTimeout("Tick()", 200); + window.setTimeout("UpdateEmbed()", 2000); + + function UpdateEmbed() + { + window.setTimeout("UpdateEmbed()", 2000); + g_frame_embed.contentDocument.location.reload(true); + } //Base init for all datas function Init() { g_div_embed_data = document.getElementById('id_div_embed_data'); + g_frame_embed = document.getElementById('id_frame_embed'); g_txtarea_code_src = document.getElementById('id_txtarea_code_src'); g_div_helper_cmd[0] = document.getElementById('id_div_helper_cmd_0'); g_div_helper_cmd[1] = document.getElementById('id_div_helper_cmd_1'); @@ -176,16 +188,12 @@ progress::-webkit-progress-value
-
....
- +
  + +
....
 
- - +
diff --git a/test/meshviewer_nacl.html b/test/meshviewer_nacl.html new file mode 100644 index 00000000..fdfe1f86 --- /dev/null +++ b/test/meshviewer_nacl.html @@ -0,0 +1,13 @@ + + + +
+ + +
+ +