Skip to content

Commit

Permalink
2.0.C: initial session backup mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
@acaldero
acaldero committed Oct 19, 2019
1 parent c4df477 commit b0829ad
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 51 deletions.
14 changes: 4 additions & 10 deletions wepsim/wepsim_web_classic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@ <h6 class="text-white bg-secondary mt-3 mb-1 border border-secondary"><span data
<a class="dropdown-item" href="#" id="s4_owncode" value="owncode"
onclick="wsweb_dialogbox_open_state();
$('#bot_check1').carousel(0);
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><em class="fas fa-stream"></em>&nbsp;<span data-langkey="Checkpoint">Checkpoint file</span></a>

<h6 class="text-white bg-secondary mt-2 mb-0 border border-secondary"><span data-langkey="Information from">Information from</span>:</h6>
Expand Down Expand Up @@ -1197,8 +1196,7 @@ <h5><strong>Binary</strong> <span class="badge badge-pill btn-success"><div clas
<div class="mx-auto">
<div class="btn-group">
<button onclick="$('#bot_check1').carousel(0);
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"
type="button"
class="btn btn-secondary px-3 py-1"><span data-langkey='Checkpoint'>Checkpoint</span></button>
Expand Down Expand Up @@ -1301,19 +1299,15 @@ <h5 class="m-0">
<h5 class="m-0">
<span class="text-white bg-secondary" data-langkey="Browser cache">Browser cache</span>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="var browserCacheElto = $('input[name=browserCacheElto]:checked');
if (typeof browserCacheElto[0] === 'undefined')
return false;
var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', browserCacheElto[0].id);
onclick="var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', 'browserCacheElto');
wsweb_dialogbox_close_state();
if (ret.error)
wepsim_notify_success('<strong>INFO</strong>', ret.msg);
else wepsim_notify_success('<strong>INFO</strong>', 'Processing load request...');
return false;"><span data-langkey="Load">Load</span></button>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="wepsim_checkpoint_clearCache();
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><span data-langkey="Reset" class="text-danger">Reset</span></button>
</h5>
</div>
Expand Down
14 changes: 7 additions & 7 deletions wepsim/wepsim_web_compact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ <h6 class="text-white bg-secondary mt-3 mb-1 border border-secondary"><span data
<a class="dropdown-item" href="#" id="s4_owncode" value="owncode"
onclick="wsweb_dialogbox_open_state();
$('#bot_check1').carousel(0);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><em class="fas fa-stream"></em>&nbsp;<span data-langkey="Checkpoint">Checkpoint file</span></a>

<h6 class="text-white bg-secondary mt-2 mb-0 border border-secondary"><span data-langkey="Information from">Information from</span>:</h6>
Expand Down Expand Up @@ -307,6 +308,7 @@ <h6 class="text-white bg-secondary mt-2 mb-0 border border-secondary"><span data
title="This button opens the 'Checkpoint' dialog."
onclick="wsweb_dialogbox_open_state();
$('#bot_check1').carousel(0);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><em class="fas fa-stream d-none d-sm-inline"></em>&nbsp;<strong><span class="d-none d-md-inline-flex" data-langkey='Checkpoint'>Checkpoint</span><span class="d-md-none">Chkpnt.</span></strong></button>

<button class="btn btn-light shadow-sm my-1 mx-0"
Expand Down Expand Up @@ -1029,7 +1031,9 @@ <h5><strong>Binary</strong> <span class="badge badge-pill btn-success"><div clas
<div class="modal-header">
<div class="mx-auto">
<div class="btn-group">
<button onclick="$('#bot_check1').carousel(0);"
<button onclick="$('#bot_check1').carousel(0);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"
type="button"
class="btn btn-secondary px-3 py-1"><span data-langkey='Checkpoint'>Checkpoint</span></button>
<button onclick="$('#bot_check1').carousel(1);"
Expand Down Expand Up @@ -1129,19 +1133,15 @@ <h5 class="m-0">
<h5 class="m-0">
<span class="text-white bg-secondary" data-langkey="Browser cache">Browser cache</span>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="var browserCacheElto = $('input[name=browserCacheElto]:checked');
if (typeof browserCacheElto[0] === 'undefined')
return false;
var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', browserCacheElto[0].id);
onclick="var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', 'browserCacheElto');
wsweb_dialogbox_close_state();
if (ret.error)
wepsim_notify_success('<strong>INFO</strong>', ret.msg);
else wepsim_notify_success('<strong>INFO</strong>', 'Processing load request...');
return false;"><span data-langkey="Load">Load</span></button>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="wepsim_checkpoint_clearCache();
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><span data-langkey="Reset" class="text-danger">Reset</span></button>
</h5>
</div>
Expand Down
16 changes: 11 additions & 5 deletions wepsim_core/wepsim_checkpoint.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,13 +412,14 @@

// visible

function wepsim_checkpoint_listCache ( )
function wepsim_checkpoint_listCache ( id_listdiv )
{
var o = '<span style="background-color:#FCFC00">&lt;<span data-langkey="Empty">Empty</span>&gt;</span>' ;

var obj_wsbackup = wepsim_checkpoint_backup_load() ;
if (obj_wsbackup.length == 0) {
return o ;
$('#' + id_listdiv + '').html(o);
return true ;
}

// build backup list
Expand All @@ -433,10 +434,11 @@
o += '</div>' ;

// return
return o ;
$('#' + id_listdiv + '').html(o);
return true ;
}

function wepsim_checkpoint_loadFromCache ( id_filename, id_tagname, id_backupcache )
function wepsim_checkpoint_loadFromCache ( id_filename, id_tagname, id_backupname )
{
var ret = {
error: true,
Expand All @@ -452,13 +454,17 @@
return ret ;
}

if (id_backupcache === null) {
var browserCacheElto = $('input[name=' + id_backupname + ']:checked');
if (typeof browserCacheElto[0] === 'undefined')
{
ret.msg = "Invalid arguments" ;
return ret ;
}
var id_backupcache = browserCacheElto[0].id ;

// try to load backup id
var obj_wsbackup = wepsim_checkpoint_backup_load() ;
obj_wsbackup = obj_wsbackup.reverse() ;

var current_checkpoint = obj_wsbackup[id_backupcache] ;
if (typeof current_checkpoint === "undefined") {
Expand Down
14 changes: 4 additions & 10 deletions ws_dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@ <h6 class="text-white bg-secondary mt-3 mb-1 border border-secondary"><span data
<a class="dropdown-item" href="#" id="s4_owncode" value="owncode"
onclick="wsweb_dialogbox_open_state();
$('#bot_check1').carousel(0);
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><em class="fas fa-stream"></em>&nbsp;<span data-langkey="Checkpoint">Checkpoint file</span></a>

<h6 class="text-white bg-secondary mt-2 mb-0 border border-secondary"><span data-langkey="Information from">Information from</span>:</h6>
Expand Down Expand Up @@ -1197,8 +1196,7 @@ <h5><strong>Binary</strong> <span class="badge badge-pill btn-success"><div clas
<div class="mx-auto">
<div class="btn-group">
<button onclick="$('#bot_check1').carousel(0);
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"
type="button"
class="btn btn-secondary px-3 py-1"><span data-langkey='Checkpoint'>Checkpoint</span></button>
Expand Down Expand Up @@ -1301,19 +1299,15 @@ <h5 class="m-0">
<h5 class="m-0">
<span class="text-white bg-secondary" data-langkey="Browser cache">Browser cache</span>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="var browserCacheElto = $('input[name=browserCacheElto]:checked');
if (typeof browserCacheElto[0] === 'undefined')
return false;
var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', browserCacheElto[0].id);
onclick="var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', 'browserCacheElto');
wsweb_dialogbox_close_state();
if (ret.error)
wepsim_notify_success('<strong>INFO</strong>', ret.msg);
else wepsim_notify_success('<strong>INFO</strong>', 'Processing load request...');
return false;"><span data-langkey="Load">Load</span></button>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="wepsim_checkpoint_clearCache();
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><span data-langkey="Reset" class="text-danger">Reset</span></button>
</h5>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ws_dist/min.wepsim_node.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ws_dist/min.wepsim_web.js
View file

Large diffs are not rendered by default.

14 changes: 4 additions & 10 deletions ws_dist/wepsim-classic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@ <h6 class="text-white bg-secondary mt-3 mb-1 border border-secondary"><span data
<a class="dropdown-item" href="#" id="s4_owncode" value="owncode"
onclick="wsweb_dialogbox_open_state();
$('#bot_check1').carousel(0);
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><em class="fas fa-stream"></em>&nbsp;<span data-langkey="Checkpoint">Checkpoint file</span></a>

<h6 class="text-white bg-secondary mt-2 mb-0 border border-secondary"><span data-langkey="Information from">Information from</span>:</h6>
Expand Down Expand Up @@ -1197,8 +1196,7 @@ <h5><strong>Binary</strong> <span class="badge badge-pill btn-success"><div clas
<div class="mx-auto">
<div class="btn-group">
<button onclick="$('#bot_check1').carousel(0);
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"
type="button"
class="btn btn-secondary px-3 py-1"><span data-langkey='Checkpoint'>Checkpoint</span></button>
Expand Down Expand Up @@ -1301,19 +1299,15 @@ <h5 class="m-0">
<h5 class="m-0">
<span class="text-white bg-secondary" data-langkey="Browser cache">Browser cache</span>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="var browserCacheElto = $('input[name=browserCacheElto]:checked');
if (typeof browserCacheElto[0] === 'undefined')
return false;
var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', browserCacheElto[0].id);
onclick="var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', 'browserCacheElto');
wsweb_dialogbox_close_state();
if (ret.error)
wepsim_notify_success('<strong>INFO</strong>', ret.msg);
else wepsim_notify_success('<strong>INFO</strong>', 'Processing load request...');
return false;"><span data-langkey="Load">Load</span></button>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="wepsim_checkpoint_clearCache();
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><span data-langkey="Reset" class="text-danger">Reset</span></button>
</h5>
</div>
Expand Down
14 changes: 7 additions & 7 deletions ws_dist/wepsim-compact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ <h6 class="text-white bg-secondary mt-3 mb-1 border border-secondary"><span data
<a class="dropdown-item" href="#" id="s4_owncode" value="owncode"
onclick="wsweb_dialogbox_open_state();
$('#bot_check1').carousel(0);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><em class="fas fa-stream"></em>&nbsp;<span data-langkey="Checkpoint">Checkpoint file</span></a>

<h6 class="text-white bg-secondary mt-2 mb-0 border border-secondary"><span data-langkey="Information from">Information from</span>:</h6>
Expand Down Expand Up @@ -307,6 +308,7 @@ <h6 class="text-white bg-secondary mt-2 mb-0 border border-secondary"><span data
title="This button opens the 'Checkpoint' dialog."
onclick="wsweb_dialogbox_open_state();
$('#bot_check1').carousel(0);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><em class="fas fa-stream d-none d-sm-inline"></em>&nbsp;<strong><span class="d-none d-md-inline-flex" data-langkey='Checkpoint'>Checkpoint</span><span class="d-md-none">Chkpnt.</span></strong></button>

<button class="btn btn-light shadow-sm my-1 mx-0"
Expand Down Expand Up @@ -1029,7 +1031,9 @@ <h5><strong>Binary</strong> <span class="badge badge-pill btn-success"><div clas
<div class="modal-header">
<div class="mx-auto">
<div class="btn-group">
<button onclick="$('#bot_check1').carousel(0);"
<button onclick="$('#bot_check1').carousel(0);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"
type="button"
class="btn btn-secondary px-3 py-1"><span data-langkey='Checkpoint'>Checkpoint</span></button>
<button onclick="$('#bot_check1').carousel(1);"
Expand Down Expand Up @@ -1129,19 +1133,15 @@ <h5 class="m-0">
<h5 class="m-0">
<span class="text-white bg-secondary" data-langkey="Browser cache">Browser cache</span>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="var browserCacheElto = $('input[name=browserCacheElto]:checked');
if (typeof browserCacheElto[0] === 'undefined')
return false;
var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', browserCacheElto[0].id);
onclick="var ret = wepsim_checkpoint_loadFromCache('FileNameToSaveAs1', 'tagToSave1', 'browserCacheElto');
wsweb_dialogbox_close_state();
if (ret.error)
wepsim_notify_success('<strong>INFO</strong>', ret.msg);
else wepsim_notify_success('<strong>INFO</strong>', 'Processing load request...');
return false;"><span data-langkey="Load">Load</span></button>
<button class="btn btn-light mx-1 float-right py-0 col-auto"
onclick="wepsim_checkpoint_clearCache();
var o = wepsim_checkpoint_listCache();
var b = $('#browserCacheList1').html(o);
wepsim_checkpoint_listCache('browserCacheList1');
return false;"><span data-langkey="Reset" class="text-danger">Reset</span></button>
</h5>
</div>
Expand Down

0 comments on commit b0829ad

Please sign in to comment.