2.2.0: add skip_notifycolon option

acaldero · Jul 13, 2022 · a94de5b · a94de5b
1 parent b53c988
commit a94de5b
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 6 deletions.
diff --git a/examples/configuration/desktop_dark.json b/examples/configuration/desktop_dark.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/examples/configuration/desktop_light.json b/examples/configuration/desktop_light.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/examples/configuration/mobile_dark.json b/examples/configuration/mobile_dark.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/examples/configuration/mobile_light.json b/examples/configuration/mobile_light.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/sim_core/sim_cfg.js b/sim_core/sim_cfg.js
@@ -201,7 +201,7 @@
              var wscfg = {
                    /* version */
                    "version":               { upgrade:false, type:"string",    value:"2.2.0" },
-                   "build":                 { upgrade:true,  type:"string",    value:"2.2.0.20220620A" },
+                   "build":                 { upgrade:true,  type:"string",    value:"2.2.0.20220705A" },
 
 	           /* simulation screen: SVG */
                    "color_data_active":     { upgrade:false, type:"string",    value:"#0066FF" },
@@ -227,6 +227,7 @@
                    "DBG_level":             { upgrade:false, type:"string",    value:"microinstruction" },
                    "DBG_limitins":          { upgrade:false, type:"int",       value:10000 },
                    "DBG_limitick":          { upgrade:false, type:"int",       value:1000 },
+                   "DBG_skip_notifycolon":  { upgrade:true,  type:"boolean",   value:false },
                    "ICON_theme":            { upgrade:false, type:"string",    value:'classic' },
                    "AS_enable":             { upgrade:true,  type:"boolean",   value:true },
                    "AS_delay":              { upgrade:true,  type:"int",       value:500 },

diff --git a/wepsim_core/wepsim_execute.js b/wepsim_core/wepsim_execute.js
@@ -409,6 +409,8 @@
 
     function wepsim_check_memdashboard ( ref_mdash, notif_origin )
     {
+	var ret = true ;
+
         if (typeof ref_mdash === "undefined") {
 	    return true ;
 	}
@@ -423,7 +425,12 @@
 	var notifications = ref_mdash.notify.length ;
 	if (notifications > 1)
            {
-                var ret = wepsim_check_getnotifyoptions(ref_mdash.notify[1]) ;
+                ret = get_cfg('DBG_skip_notifycolon') ;
+	        if (ret) {
+	            return true ;
+                }
+
+                ret = wepsim_check_getnotifyoptions(ref_mdash.notify[1]) ;
 	        if (ret.skipme) {
 	            return true ;
                 }

diff --git a/wepsim_web/wepsim_web_ui_config_commands.js b/wepsim_web/wepsim_web_ui_config_commands.js
@@ -77,6 +77,7 @@
 		                                   "wepsim_config_button_toggle('ws_skin_dark_mode',true,'15');"),
 		      code_init:   function() {
                                        wepsim_config_button_pretoggle('ws_skin_dark_mode', '15') ;
+			               var optValue = get_cfg('ws_skin_dark_mode') ;
 			               wepsim_restore_darkmode(optValue) ;
 		                   },
                       description: "<span data-langkey='Dark Mode'>Dark Mode</span>"
@@ -208,6 +209,24 @@
                       description: "<span data-langkey='Limit instruction ticks: to limit clock ticks'>Limit instruction ticks: to limit clock ticks</span>"
                    });
 
+    ws_info.config_ui.push({
+                      id:          "radio4",
+                      type:        "Execution",
+                      u_class:     "",
+                      code_cfg:    wepsim_config_button_html_onoff('4', 'Skip notify: comments',
+                                                  i18n_get_TagFor('cfg', 'Off'),
+		                                   "update_cfg('editor_mode', false);" +
+		                                   "wepsim_config_button_toggle('DBG_skip_notifycolon',false,'4');",
+                                                  i18n_get_TagFor('cfg', 'On'),
+		                                   "update_cfg('editor_mode', true);" +
+		                                   "wepsim_config_button_toggle('DBG_skip_notifycolon',true,'4');"),
+		      code_init:   function() {
+                                       wepsim_config_button_pretoggle('DBG_skip_notifycolon', '4') ;
+		                   },
+	              description: "<span data-langkey='Skip notify: comments'>Skip notify: comments</span>"
+                   });
+
+
     ws_info.config_ui.push({
                       id:          "radio7",
                       type:        "Editor",

diff --git a/ws_dist/examples/configuration/desktop_dark.json b/ws_dist/examples/configuration/desktop_dark.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/ws_dist/examples/configuration/desktop_light.json b/ws_dist/examples/configuration/desktop_light.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/ws_dist/examples/configuration/mobile_dark.json b/ws_dist/examples/configuration/mobile_dark.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/ws_dist/examples/configuration/mobile_light.json b/ws_dist/examples/configuration/mobile_light.json
@@ -104,6 +104,11 @@
     "type": "int",
     "value": 1000
   },
+  "DBG_skip_notifycolon": {
+    "upgrade": false,
+    "type": "boolean",
+    "value": false
+  },
   "ICON_theme": {
     "upgrade": false,
     "type": "string",

diff --git a/ws_dist/min.sim_all.js b/ws_dist/min.sim_all.js
diff --git a/ws_dist/min.wepsim_core.js b/ws_dist/min.wepsim_core.js
diff --git a/ws_dist/min.wepsim_node.js b/ws_dist/min.wepsim_node.js
diff --git a/ws_dist/min.wepsim_web.js b/ws_dist/min.wepsim_web.js