Browse Source

Merge branch 'trimBugCorrection' of LInE/iVProg into master

GitAdmin 3 years ago
parent
commit
535dd90297
2 changed files with 24 additions and 4 deletions
  1. 20 0
      js/visualUI/commands/variable_value_menu.js
  2. 4 4
      js/visualUI/globals.js

+ 20 - 0
js/visualUI/commands/variable_value_menu.js

@@ -127,6 +127,15 @@ export function renderMenu (
 
   menu_var_or_value = $(menu_var_or_value);
 
+  menu_var_or_value.find('.width-dynamic').on('input', function() {
+    var input_field = $(this);
+    var inputWidth = input_field.textWidth()+10;
+    inputWidth = inputWidth<50?50:inputWidth;
+      input_field.css({
+          width: inputWidth
+      })
+  }).trigger('input');
+
   dom_object.append(menu_var_or_value);
 
   ref_object.dom_object = menu_var_or_value;
@@ -1697,6 +1706,17 @@ function openInputToValue (
     '<input type="text" size="2" class="width-dynamic-minus" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />'
   );
   field.insertBefore(dom_object.find(".menu_var_or_value_dom"));
+
+
+  field.on('input', function() {
+    var input_field = $(this);
+    var inputWidth = input_field.textWidth()+10;
+    inputWidth = inputWidth<50?50:inputWidth;
+      input_field.css({
+          width: inputWidth
+      })
+  }).trigger('input');
+
   const rendered = $('<div class="value_rendered"></div>');
   rendered.insertBefore(field);
 

+ 4 - 4
js/visualUI/globals.js

@@ -763,8 +763,8 @@ function enableGlobalValueUpdate (global_var, parent_node) {
 			} else{
 				if (global_var.type == Types.INTEGER) {
 					global_var.value = parseInt(input_field.val().trim());
-				} else if (var_obj.type == Types.CHAR) {
-					var_obj.value = input_field.val().charAt(0);
+				} else if (global_var.type == Types.CHAR) {
+					global_var.value = input_field.val().charAt(0);
 				} else {
 					global_var.value = input_field.val().trim();
 				}
@@ -807,8 +807,8 @@ function enableGlobalValueUpdate (global_var, parent_node) {
 				} else {
 					if (global_var.type == Types.INTEGER) {
 						global_var.value = parseInt(input_field.val().trim());
-					} else if (var_obj.type == Types.CHAR) {
-						var_obj.value = input_field.val().charAt(0);
+					} else if (global_var.type == Types.CHAR) {
+						global_var.value = input_field.val().charAt(0);
 					} else {
 						global_var.value = input_field.val().trim();
 					}