Browse Source

comboLookupText fix

bohdan.kotenko 4 years ago
parent
commit
c98af71a3d
3 changed files with 9 additions and 6 deletions
  1. 1 1
      mix.exs
  2. 7 4
      priv/js/comboLookup.js
  3. 1 1
      src/elements/combo/element_comboLookupText.erl

+ 1 - 1
mix.exs

@@ -4,7 +4,7 @@ defmodule NITRO.Mixfile do
   def project do
     [
       app: :nitro,
-      version: "6.4.3",
+      version: "6.4.4",
       description: "NITRO Nitrogen Web Framework",
       package: package(),
       deps: deps()

+ 7 - 4
priv/js/comboLookup.js

@@ -23,17 +23,20 @@ function displayTextarea(parent, input, textarea) {
   if (parentDom && textareaDom) {
     parentDom.style.display = 'none';
     textareaDom.style.display = 'flex';
-    textareaDom.children[0].innerHTML = value.text ? value.text : "";
+    textareaDom.children[0].value = value.text ? value.text :
+                                    typeof value === 'string' ? value : "";
   }
 }
 
-function hideTextarea(parent, textarea) {
+function hideTextarea(parent, input, textarea) {
   let parentDom = qi(parent);
+  let inputDom = qi(input)
   let textareaDom = qi(textarea);
-  if (parentDom && textareaDom) {
+  if (parentDom && textareaDom && inputDom) {
     parentDom.style.display = 'flex';
+    const value = textareaDom.children[0].value;
+    inputDom.value = value ? value : "";
     textareaDom.style.display = 'none';
-    textareaDom.children[0].innerHTML = '';
   }
 }
 

+ 1 - 1
src/elements/combo/element_comboLookupText.erl

@@ -43,5 +43,5 @@ render_element(#comboLookupText{id=Id, input=Input, disabled=Disabled, validatio
                     [#link{
                       class = [button, sgreen, back],
                       style = "min-width: 40px; text-align: center; height: fit-content; margin-left: 5px;",
-                      onclick = nitro:jse("hideTextarea('" ++ LookupId ++ "', '" ++ TextareaId ++ "')"),
+                      onclick = nitro:jse("hideTextarea('" ++ LookupId ++ "', '" ++ InputId ++ "', '" ++ TextareaId ++ "')"),
                       body = <<"+">>}] end]}]}).