Skip to content

Commit

Permalink
2.0.A: minor updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@acaldero
acaldero committed Aug 10, 2019
1 parent a04c63a commit 2cf91f5
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 37 deletions.
64 changes: 32 additions & 32 deletions wepsim/wepsim_web_simulator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
//$(".multi-collapse-2").collapse("show") ;
inputfirm.setOption('readOnly', false) ;

if ('on' === cur_skin_user[1])
if ('on' === cur_skin_user[1])
{
$("#tab24").click() ;
inputfirm.setOption('readOnly', true) ;
new_classes.push('.user_microcode') ;
}
}
}
if ('only_frequent' === cur_skin_user[2])
{
Expand Down Expand Up @@ -135,31 +135,31 @@
$('#cpu_ALL').html(msg_default) ;
wepsim_init_cpu('#cpu_ALL') ;
},
reset: function() {
reset: function() {
return true ;
}
},

"CONTROL_MEMORY": {
init: function() {
init: function() {
return true ;
},
reset: function() {
show_control_memory(simhw_internalState('MC'),
show_control_memory(simhw_internalState('MC'),
simhw_internalState('MC_dashboard'),0,true);
},
update_draw: wepsim_svg_update_draw,
update_bus_visibility: wepsim_svg_update_bus_visibility
},

"MEMORY": {
init: function() {
return true ;
},
reset: function() {
show_main_memory(simhw_internalState('MP'), 0, true, false) ;
},
show_main_memory: wepsim_show_main_memory,
show_main_memory: wepsim_show_main_memory,
show_asmdbg_pc: wepsim_show_asmdbg_pc,
show_control_memory: wepsim_show_control_memory,
show_dbg_mpc: wepsim_show_dbg_mpc,
Expand All @@ -171,7 +171,7 @@
$('#config_MP').html(msg_default) ;
init_config_mp('#config_MP') ;
},
reset: function() {
reset: function() {
return true ;
}
},
Expand All @@ -181,7 +181,7 @@
$('#io_ALL').html(msg_default) ;
wepsim_init_io('#io_ALL') ;
},
reset: function() {
reset: function() {
return true ;
}
},
Expand All @@ -191,29 +191,29 @@
$('#config_IO').html(msg_default) ;
wepsim_init_config_io('#config_IO') ;
},
reset: function() {
reset: function() {
return true ;
}
},
"SCREEN": {
init: function() {
init: function() {
return true ;
},
reset: function() {
wepsim_set_screen_content("") ;
},
get_screen_content: wepsim_get_screen_content,
get_screen_content: wepsim_get_screen_content,
set_screen_content: wepsim_set_screen_content
},

"KEYBOARD": {
init: function() {
init: function() {
return true ;
},
reset: function() {
return true ;
},
get_keyboard_content: wepsim_get_keyboard_content,
get_keyboard_content: wepsim_get_keyboard_content,
set_keyboard_content: wepsim_set_keyboard_content
}
} ;
Expand Down Expand Up @@ -374,7 +374,7 @@
"\n" +
"Diagnostic:\n" +
" * Error message: " + err.message + "\n" +
" * Runtime stack:\n" + err.stack +
" * Runtime stack:\n" + err.stack +
"\n" +
"After close this alert, WepSIM will try to reload and by-pass the cache (just in case).\n") ;

Expand Down Expand Up @@ -454,7 +454,7 @@
' </span>' +
'</li>' ;

o += '<button type="button" id="close" data-role="none" ' +
o += '<button type="button" id="close" data-role="none" ' +
' class="btn btn-sm btn-danger w-100 p-0 mt-2" ' +
' onclick="wsweb_quickmenu_close(); ' +
' return false;">' +
Expand Down Expand Up @@ -500,7 +500,7 @@
' </div>' +
'</li>' ;

o += '<button type="button" id="close" data-role="none" ' +
o += '<button type="button" id="close" data-role="none" ' +
' class="btn btn-sm btn-danger w-100 p-0 mt-3" ' +
' onclick="wsweb_quickslider_close(); ' +
' return false;">' +
Expand All @@ -521,15 +521,15 @@
animation: false,
container: 'body',
template: '<div class="popover shadow border border-secondary" role="tooltip">' +
'<div class="arrow"></div><h3 class="popover-header"></h3>' +
'<div class="arrow"></div><h3 class="popover-header"></h3>' +
'<div class="popover-body"></div>' +
'</div>',
content: fun_content,
sanitizeFn: function (content) {
return content ; // DOMPurify.sanitize(content) ;
}
}).on('shown.bs.popover',
function(shownEvent) {
}).on('shown.bs.popover',
function(shownEvent) {
fun_ownshown(shownEvent);
i18n_update_tags('dialogs') ;
i18n_update_tags('gui') ;
Expand Down Expand Up @@ -561,7 +561,7 @@
// set wepsim version
$("div.wsversion").replaceWith(get_cfg('version'));

// init: state dialog
// init: state dialog
$('#end_state1').tokenfield({ inputType: 'textarea' }) ;
//A1/ var inputEls = document.getElementById(id_div_state1);
//A1/ if (null !== inputEls)
Expand Down Expand Up @@ -591,26 +591,26 @@
}
}) ;

// init: quick-menu
wepsim_init_quickcfg("#po1",
'manual',
// init: quick-menu
wepsim_init_quickcfg("#po1",
'manual',
function() { return wepsim_show_quick_menu('po1') ; },
function() { }) ;

wepsim_init_quickcfg("#popover-slidercfg",
wepsim_init_quickcfg("#popover-slidercfg",
'click',
wepsim_show_slidercfg_menu,
function(shownEvent) {
function(shownEvent) {
$("#slider3a").val(get_cfg('C1C2_size')) ;
$("#slider3b").val(get_cfg('CPUCU_size')) ;
}) ;

wepsim_init_quickcfg("[data-toggle=popover2]",
wepsim_init_quickcfg("[data-toggle=popover2]",
'click',
function(shownEvent) {
function(shownEvent) {
return wepsim_show_asm_columns_checked('popover2_asm') ;
},
function(shownEvent) {
function(shownEvent) {
showhideAsmHeader() ;
}) ;

Expand Down Expand Up @@ -662,11 +662,11 @@
} ;
inputasm = sim_init_editor("inputAssembly", inputasm_cfg) ;

// init: record
// init: record
simcore_record_init('record_msg', 'record_pb') ;
simcore_record_captureInit() ;

// init: help idiom selectors
// init: help idiom selectors
wepsim_init_helpDropdown() ;

// restore UI view
Expand Down
12 changes: 9 additions & 3 deletions wepsim_core/wepsim_ui_registers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@
"<div class='col p-1'>" +
"<button type='button' id='close' data-role='none' " +
" class='btn btn-sm btn-danger w-100 p-0 mt-1' " +
" onclick='$(\"#popover-rfcfg\").popover(\"hide\");'>Close</button>" +
" onclick='$(\"#popover-rfcfg\").popover(\"hide\");'>" +
"<span data-langkey='Close'>Close</span>" +
"</button>" +
"</div>" +
"</div>" +

Expand Down Expand Up @@ -398,11 +400,15 @@
'<div class="popover-body"></div>' +
'</div>',
container: 'body',
content: quick_config_rf(),
content: quick_config_rf,
sanitizeFn: function (content) {
return content ; // DOMPurify.sanitize(content) ;
}
});
}).on('shown.bs.popover',
function(shownEvent) {
i18n_update_tags('cfg') ;
i18n_update_tags('dialogs') ;
}) ;
}

function fullshow_eltos ( sim_eltos, filter )
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.

0 comments on commit 2cf91f5

Please sign in to comment.