Merge branch 'trimBugCorrection' of LInE/iVProg into master

js/visualUI/code_generator.js

@@ -730,6 +730,10 @@ function variableValueMenuCode (variable_obj, is_return = false) {
         } else {
           ret += '"' + variable_obj.content + '"';
         }
+      } else if (content.length == 0) {
+        ret += '""';
+      } else if (content.trim().length == 0) {
+        ret += '"' + content + '"';
       } else {
         ret += variable_obj.content;
       }

js/visualUI/commands/variable_value_menu.js

@@ -893,10 +893,18 @@ function variableValueMenuCode (
       });
     }
   } else {
-    let variable_render =
-      '<div class="variable_rendered"> <span class="var_name">' +
-      variable_obj.content +
-      "</span>";
+    let variable_render;
+
+    variable_render =
+      '<div class="variable_rendered"> <span class="var_name">';
+
+    if (isNaN(variable_obj.content)) {
+      variable_render += variable_obj.content.replaceAll(" ", "&nbsp;");
+    } else {
+      variable_render += variable_obj.content;
+    }
+
+    variable_render += "</span>";
     variable_render += "</div>";
 
     variable_render = $(variable_render);
@@ -1723,9 +1731,7 @@ function openInputToValue (
 
   context_menu.dropdown({
     onChange: function (value, text, $selectedItem) {
-      console.log("S11");
       if ($selectedItem.data("clear")) {
-        console.log("PP10");
         dom_object.text("");
 
         dom_object.find(".value_rendered").remove();
@@ -1765,7 +1771,7 @@ function openInputToValue (
   });
 
   dom_object.find(".width-dynamic-minus").focusout(function () {
-    if (
+    /*if (
       $(this)
         .val()
         .trim()
@@ -1773,16 +1779,22 @@ function openInputToValue (
       ref_object.content = $(this)
         .val()
         .trim();
-    }
+    }*/
+    ref_object.content = $(this)
+        .val();
 
-    rendered.text(ref_object.content);
+    if (isNaN(ref_object.content)) {
+      rendered.html(ref_object.content.replaceAll(" ", "&nbsp;"));
+    } else {
+      rendered.text(ref_object.content);
+    }
     $(this).remove();
   });
 
   dom_object.find(".width-dynamic-minus").on("keydown", function (e) {
     const code = e.keyCode || e.which;
     if (code == 13) {
-      if (
+      /*if (
         $(this)
           .val()
           .trim()
@@ -1790,13 +1802,24 @@ function openInputToValue (
         ref_object.content = $(this)
           .val()
           .trim();
+      }*/
+      ref_object.content = $(this)
+          .val();
+
+      if (isNaN(ref_object.content)) {
+        rendered.html(ref_object.content.replaceAll(" ", "&nbsp;"));
+      } else {
+        rendered.text(ref_object.content);
       }
-      rendered.text(ref_object.content);
 
       $(this).remove();
     }
     if (code == 27) {
-      rendered.text(ref_object.content);
+      if (isNaN(ref_object.content)) {
+        rendered.html(ref_object.content.replaceAll(" ", "&nbsp;"));
+      } else {
+        rendered.text(ref_object.content);
+      }
 
       $(this).remove();
     }