From 112ed8330395428aa5721902342140678fa86fd1 Mon Sep 17 00:00:00 2001 From: Vlad Date: Mon, 20 Dec 2021 11:29:18 +0200 Subject: [PATCH 1/2] Updates: - function Update-PodeWebTextbox: update rows property - function Set-PodeWebHomePage: enable IIS auth - default.js: form stepper ignore enter key press for multi line textbox, update rows property - textbox.pode: set textbox value --- src/Public/Outputs.ps1 | 9 +++++++++ src/Templates/Public/scripts/default.js | 5 ++++- src/Templates/Views/elements/textbox.pode | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Public/Outputs.ps1 b/src/Public/Outputs.ps1 index 58efdb71..ea5fb9fd 100644 --- a/src/Public/Outputs.ps1 +++ b/src/Public/Outputs.ps1 @@ -514,6 +514,10 @@ function Update-PodeWebTextbox [string] $Id, + [Alias('Height')] + [int] + $Size = 4, + [Parameter()] [switch] $AsJson, @@ -536,12 +540,17 @@ function Update-PodeWebTextbox $items = ($items | Out-String) } + if ($Size -le 0) { + $Size = 4 + } + return @{ Operation = 'Update' ObjectType = 'Textbox' Value = $items ID = $Id Name = $Name + Size = $Size AsJson = $AsJson.IsPresent Multiline = $Multiline.IsPresent } diff --git a/src/Templates/Public/scripts/default.js b/src/Templates/Public/scripts/default.js index 0f836a03..19a0afff 100644 --- a/src/Templates/Public/scripts/default.js +++ b/src/Templates/Public/scripts/default.js @@ -409,7 +409,7 @@ function setupSteppers() { btn = stepper.find('.bs-stepper-content .bs-stepper-pane.active button.step-submit'); } - if (btn) { + if (btn && !isEnterKey(e)) { btn.trigger('click'); } }); @@ -2795,6 +2795,9 @@ function updateTextbox(action) { } txt.val(action.Value); + if (Number.isInteger(action.Size)) { + txt[0].rows = action.Size; + } } function writeTextbox(action, sender) { diff --git a/src/Templates/Views/elements/textbox.pode b/src/Templates/Views/elements/textbox.pode index 143d25ce..bb2e85d4 100644 --- a/src/Templates/Views/elements/textbox.pode +++ b/src/Templates/Views/elements/textbox.pode @@ -31,7 +31,7 @@ $events = ConvertTo-PodeWebEvents -Events $data.Events if ($data.Multiline) { - $element = "" + $element = "" } else { if ($data.Prepend.Enabled -or $data.Append.Enabled) { From e41dbaf31394be81fbcdd7480216ac8e7b52d6f1 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 22 Dec 2021 20:30:59 +0200 Subject: [PATCH 2/2] PR #251 fixes --- src/Public/Outputs.ps1 | 6 +----- src/Templates/Public/scripts/default.js | 2 +- src/Templates/Views/elements/textbox.pode | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Public/Outputs.ps1 b/src/Public/Outputs.ps1 index ea5fb9fd..5506de83 100644 --- a/src/Public/Outputs.ps1 +++ b/src/Public/Outputs.ps1 @@ -516,7 +516,7 @@ function Update-PodeWebTextbox [Alias('Height')] [int] - $Size = 4, + $Size = 0, [Parameter()] [switch] @@ -540,10 +540,6 @@ function Update-PodeWebTextbox $items = ($items | Out-String) } - if ($Size -le 0) { - $Size = 4 - } - return @{ Operation = 'Update' ObjectType = 'Textbox' diff --git a/src/Templates/Public/scripts/default.js b/src/Templates/Public/scripts/default.js index 19a0afff..95516192 100644 --- a/src/Templates/Public/scripts/default.js +++ b/src/Templates/Public/scripts/default.js @@ -2795,7 +2795,7 @@ function updateTextbox(action) { } txt.val(action.Value); - if (Number.isInteger(action.Size)) { + if (action.Multiline && action.Size > 0) { txt[0].rows = action.Size; } } diff --git a/src/Templates/Views/elements/textbox.pode b/src/Templates/Views/elements/textbox.pode index bb2e85d4..03ac74ad 100644 --- a/src/Templates/Views/elements/textbox.pode +++ b/src/Templates/Views/elements/textbox.pode @@ -31,7 +31,7 @@ $events = ConvertTo-PodeWebEvents -Events $data.Events if ($data.Multiline) { - $element = "" + $element = "" } else { if ($data.Prepend.Enabled -or $data.Append.Enabled) {