Handle line feed in the input fields. Increase size of text input fie…

…lds to 40.
BlueAndi · Aug 10, 2024 · ea6d21e · ea6d21e
1 parent a2618b4
commit ea6d21e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/lib/IconTextLampPlugin/web/IconTextLampPlugin.html b/lib/IconTextLampPlugin/web/IconTextLampPlugin.html
@@ -111,7 +111,7 @@ <h3 class="mt-1">Text</h3>
                     </div>
                     <div class="form-group">
                         <label for="justText">Text:</label>
-                        <input type="text" id="justText" name="justText" value="" size="20" />
+                        <input type="text" id="justText" name="justText" value="" size="40" />
                     </div>
                     <div class="form-group">
                         <label for="iconFullPath">Icon full path:</label>
@@ -276,7 +276,7 @@ <h3 class="mt-1">Lamp</h3>
                     var justTextInput = document.getElementById(justTextId);
                     var iconFullPathInput = document.getElementById(iconFullPathId);
 
-                    justTextInput.value = rsp.data.text;
+                    justTextInput.value = rsp.data.text.replaceAll("\n", "\\n");
                     iconFullPathInput.value = rsp.data.iconFullPath;
 
                 }).catch(function(rsp) {
@@ -289,6 +289,9 @@ <h3 class="mt-1">Lamp</h3>
             function setText(pluginUid, justText, iconFullPath) {
                 disableUI();
 
+                justText = justText.replaceAll("\\n", "\n");
+                justText = justText.replaceAll("\\r", "");
+
                 return utils.makeRequest({
                     method: "POST",
                     url: "/rest/api/v1/display/uid/" + pluginUid + "/text",

diff --git a/lib/IconTextPlugin/web/IconTextPlugin.html b/lib/IconTextPlugin/web/IconTextPlugin.html
@@ -95,7 +95,7 @@ <h3 class="mt-1">Text</h3>
                     </div>
                     <div class="form-group">
                         <label for="justText">Text:</label>
-                        <input type="text" id="justText" name="justText" value="" size="20" />
+                        <input type="text" id="justText" name="justText" value="" size="40" />
                     </div>
                     <div class="form-group">
                         <label for="iconFullPath">Icon full path:</label>
@@ -233,7 +233,7 @@ <h3 class="mt-1">Text</h3>
                     var justTextInput = document.getElementById(justTextId);
                     var iconFullPathInput = document.getElementById(iconFullPathId);
 
-                    justTextInput.value = rsp.data.text;
+                    justTextInput.value = rsp.data.text.replaceAll("\n", "\\n");
                     iconFullPathInput.value = rsp.data.iconFullPath;
 
                 }).catch(function(rsp) {
@@ -246,6 +246,9 @@ <h3 class="mt-1">Text</h3>
             function setText(pluginUid, justText, iconFullPath) {
                 disableUI();
 
+                justText = justText.replaceAll("\\n", "\n");
+                justText = justText.replaceAll("\\r", "");
+
                 return utils.makeRequest({
                     method: "POST",
                     url: "/rest/api/v1/display/uid/" + pluginUid + "/text",

diff --git a/lib/JustTextPlugin/web/JustTextPlugin.html b/lib/JustTextPlugin/web/JustTextPlugin.html
@@ -62,7 +62,7 @@ <h3 class="mt-1">Text</h3>
                     </div>
                     <div class="form-group">
                         <label for="justText">Text:</label>
-                        <input type="text" id="justText" name="justText" value="" size="20" />                            
+                        <input type="text" id="justText" name="justText" value="" size="40" />                            
                     </div>
                     <input name="submit" type="submit" value="Update"/>
                 </form>          
@@ -156,6 +156,8 @@ <h3 class="mt-1">Text</h3>
 
                     justTextInput.value = rsp.data.text;
 
+                    justTextInput.value = rsp.data.text.replaceAll("\n", "\\n");
+
                 }).catch(function(rsp) {
                     alert("Internal error.");
                 }).finally(function() {
@@ -166,6 +168,9 @@ <h3 class="mt-1">Text</h3>
             function setText(pluginUid, justText) {
                 disableUI();
 
+                justText = justText.replaceAll("\\n", "\n");
+                justText = justText.replaceAll("\\r", "");
+
                 return utils.makeRequest({
                     method: "POST",
                     url: "/rest/api/v1/display/uid/" + pluginUid + "/text",