Skip to content
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

Configuration & iPhone style fixes for the options widget action #1734

Merged
merged 4 commits into from
Mar 3, 2023
Merged

Configuration & iPhone style fixes for the options widget action #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e264f5
Fix widget action `options` too large on iPhone in openHAB app
florian-h05 Feb 25, 2023
bfc3e9a
Trim whitespaces in widget action `options`
florian-h05 Feb 25, 2023
fab6b72
Add comment for style fix to app.styl
florian-h05 Feb 25, 2023
2f899d1
Address review
florian-h05 Mar 3, 2023
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
6 changes: 3 additions & 3 deletions bundles/org.openhab.ui/web/src/components/widgets/widget-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ export const actionsMixin = {
const actionsPromise = new Promise((resolve, reject) => {
if (actionCommandOptions && typeof actionCommandOptions === 'string') {
resolve(actionCommandOptions.split(',').map((o) => {
const parts = o.split('=')
const parts = o.trim().split('=')
return {
text: parts[1] || parts[0],
text: parts[1].trim() || parts[0].trim(),
color: 'blue',
onClick: () => {
this.$store.dispatch('sendCommand', { itemName: actionCommandOptionsItem, cmd: parts[0] })
this.$store.dispatch('sendCommand', { itemName: actionCommandOptionsItem, cmd: parts[0].trim() })
.then(() => this.showActionFeedback(prefix, actionConfig))
}
}
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.openhab.ui/web/src/css/app.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ html
.delete
--f7-bars-link-color #ff3b30

// Fix actions-modal/popup is placed behind the notch or outside of the screen on iPhone in openHAB iOS app
.device-ios .actions-modal
max-height: calc(100% - var(--f7-safe-area-top) - var(--f7-safe-area-bottom))

.md .contextual-toolbar
--f7-theme-color #474747
--f7-bars-bg-color #474747
Expand Down