Skip to content

Small fixes to PodeWebTextbox #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Small fixes to PodeWebTextbox #251

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ab8f83b
Merge pull request #26 from Badgerati/develop
Badgerati Feb 5, 2021
c94e02f
Merge pull request #42 from Badgerati/develop
Badgerati Apr 8, 2021
80b554f
Merge pull request #58 from Badgerati/develop
Badgerati May 14, 2021
212555c
Merge pull request #112 from Badgerati/develop
Badgerati Jun 27, 2021
5fe11ea
Merge pull request #127 from Badgerati/develop
Badgerati Jul 21, 2021
d9a0671
Merge pull request #180 from Badgerati/develop
Badgerati Sep 8, 2021
263b0be
Merge pull request #193 from Badgerati/develop
Badgerati Oct 11, 2021
d877325
Merge pull request #206 from Badgerati/develop
Badgerati Nov 16, 2021
57f8559
Merge pull request #248 from Badgerati/develop
Badgerati Dec 10, 2021
112ed83
Updates:
ittchmh Dec 20, 2021
8fdfa89
Merge pull request #1 from ittchmh/PR57f85591
ittchmh Dec 20, 2021
e41dbaf
PR #251 fixes
ittchmh Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Public/Outputs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,10 @@ function Update-PodeWebTextbox
[string]
$Id,

[Alias('Height')]
[int]
$Size = 4,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd make it so the default here is 0, so we can skip updating the textarea if no Size is passed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


[Parameter()]
[switch]
$AsJson,
Expand All @@ -536,12 +540,17 @@ function Update-PodeWebTextbox
$items = ($items | Out-String)
}

if ($Size -le 0) {
$Size = 4
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove this part if default size is 0.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


return @{
Operation = 'Update'
ObjectType = 'Textbox'
Value = $items
ID = $Id
Name = $Name
Size = $Size
AsJson = $AsJson.IsPresent
Multiline = $Multiline.IsPresent
}
Expand Down
5 changes: 4 additions & 1 deletion src/Templates/Public/scripts/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the !isEnterKey(e) needed here? As ~9 lines up we do the same check and return 🤔

Copy link
Author

@ittchmh ittchmh Dec 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the && !isEnterKey(e) not set, it adding new line and execute Next button actio
7rAOMmPD46
n

btn.trigger('click');
}
});
Expand Down Expand Up @@ -2795,6 +2795,9 @@ function updateTextbox(action) {
}

txt.val(action.Value);
if (Number.isInteger(action.Size)) {
txt[0].rows = action.Size;
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Size parameter is an [int] so the Number check isn't needed. It was also be worth checking that the textbox is a textarea as well, something like:

if (action.Multiline && action.Size > 0) {
    txt[0].rows = action.Size;
}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

}

function writeTextbox(action, sender) {
Expand Down
2 changes: 1 addition & 1 deletion src/Templates/Views/elements/textbox.pode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
$events = ConvertTo-PodeWebEvents -Events $data.Events

if ($data.Multiline) {
$element = "<textarea class='form-control $(if ($data.NoForm) { 'no-form' })' id='$($data.ID)' name='$($data.Name)' pode-object='$($data.ObjectType)' placeholder='$($data.Placeholder)' rows='$($data.Size)' style='$($width) $($data.CssStyles)' $($describedBy) $($readOnly) $($required) $($value) $($events)></textarea>"
$element = "<textarea class='form-control $(if ($data.NoForm) { 'no-form' })' id='$($data.ID)' name='$($data.Name)' pode-object='$($data.ObjectType)' placeholder='$($data.Placeholder)' rows='$($data.Size)' style='$($width) $($data.CssStyles)' $($describedBy) $($readOnly) $($required) $($value) $($events)>$($data.Value)</textarea>"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth removing the $($value) property being set here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

}
else {
if ($data.Prepend.Enabled -or $data.Append.Enabled) {
Expand Down