From d5a8f457b23612b409a9d707d14cb1dae18feac2 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 15 Jul 2021 16:27:01 -0300 Subject: [PATCH 1/2] allow modal to scroll and change focus on enter --- navigator/components/ModalPrompt.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/navigator/components/ModalPrompt.js b/navigator/components/ModalPrompt.js index bfebdc5..5bc2eb2 100644 --- a/navigator/components/ModalPrompt.js +++ b/navigator/components/ModalPrompt.js @@ -49,6 +49,7 @@ export class ModalPrompt { construct_element() { let bg = this.modal = document.createElement("div"); bg.classList.add("modal"); + bg.style.overflowY = "auto"; let fg = document.createElement("div"); fg.classList.add("modal-dialog"); bg.appendChild(fg); @@ -203,6 +204,14 @@ export class ModalPrompt { this.show(); inputs[0].focus(); + for (let i = 0; i < inputs.length - 1; i++) { + inputs[i].onchange = () => { + inputs[i+1].focus(); + } + } + inputs[inputs.length - 1].onchange = () => { + this.ok.focus(); + } return new Promise((resolve, reject) => { this.ok.onclick = () => { let response = {}; From d4fcf47a82f1b0bf1b465f5b95886ad9229ab16b Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 15 Jul 2021 16:30:56 -0300 Subject: [PATCH 2/2] prepare for packaging --- CHANGELOG.md | 5 +++-- README.md | 10 +++++----- manifest.json | 4 ++-- packaging/el7/main.spec | 3 +++ packaging/el8/main.spec | 3 +++ packaging/focal/changelog | 7 +++++++ 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57bf448..e41764b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ -## Cockpit Navigator 0.5.0-1 +## Cockpit Navigator 0.5.1-1 -* Implement custom modal style popups to replace browser dialogs. \ No newline at end of file +* Allow modal popups to scroll if overflowing past page. +* Moves focus to next input in modal popup when enter is pressed. \ No newline at end of file diff --git a/README.md b/README.md index 4a11595..45c420c 100644 --- a/README.md +++ b/README.md @@ -23,17 +23,17 @@ With no command line use needed, you can: # Installation ## From Github Release ### Ubuntu -1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.0/cockpit-navigator_0.5.0-1focal_all.deb` -1. `# apt install ./cockpit-navigator_0.5.0-1focal_all.deb` +1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.1/cockpit-navigator_0.5.1-1focal_all.deb` +1. `# apt install ./cockpit-navigator_0.5.1-1focal_all.deb` ### EL7 -1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.0/cockpit-navigator-0.5.0-1.el7.noarch.rpm` +1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.1/cockpit-navigator-0.5.1-1.el7.noarch.rpm` ### EL8 -1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.0/cockpit-navigator-0.5.0-1.el8.noarch.rpm` +1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.1/cockpit-navigator-0.5.1-1.el8.noarch.rpm` ## From Source 1. Ensure dependencies are installed: `cockpit`, `python3`, `rsync`, `zip`. 1. `$ git clone https://github.com/45Drives/cockpit-navigator.git` 1. `$ cd cockpit-navigator` -1. `$ git checkout ` (v0.5.0 is latest) +1. `$ git checkout ` (v0.5.1 is latest) 1. `# make install` ## From 45Drives Repositories ### Ubuntu diff --git a/manifest.json b/manifest.json index a26889b..fb36ddc 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "name": "cockpit-navigator", "title": "Cockpit Navigator", "prerelease": false, - "version": "0.5.0", + "version": "0.5.1", "buildVersion": "1", "author": "Josh Boudreau ", "url": "https://github.com/45Drives/cockpit-navigator", @@ -54,7 +54,7 @@ ], "changelog": { "urgency": "medium", - "version": "0.5.0", + "version": "0.5.1", "buildVersion": "1", "ignore": [], "date": null, diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec index eee3a24..f0811a7 100644 --- a/packaging/el7/main.spec +++ b/packaging/el7/main.spec @@ -32,6 +32,9 @@ rm -rf %{buildroot} /usr/share/cockpit/navigator/* %changelog +* Thu Jul 15 2021 Josh Boudreau 0.5.1-1 +- Allow modal popups to scroll if overflowing past page. +- Moves focus to next input in modal popup when enter is pressed. * Thu Jul 15 2021 Josh Boudreau 0.5.0-1 - Implement custom modal style popups to replace browser dialogs. * Wed Jul 07 2021 Josh Boudreau 0.4.6-3 diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec index eee3a24..f0811a7 100644 --- a/packaging/el8/main.spec +++ b/packaging/el8/main.spec @@ -32,6 +32,9 @@ rm -rf %{buildroot} /usr/share/cockpit/navigator/* %changelog +* Thu Jul 15 2021 Josh Boudreau 0.5.1-1 +- Allow modal popups to scroll if overflowing past page. +- Moves focus to next input in modal popup when enter is pressed. * Thu Jul 15 2021 Josh Boudreau 0.5.0-1 - Implement custom modal style popups to replace browser dialogs. * Wed Jul 07 2021 Josh Boudreau 0.4.6-3 diff --git a/packaging/focal/changelog b/packaging/focal/changelog index 4b66ca7..b9508fd 100644 --- a/packaging/focal/changelog +++ b/packaging/focal/changelog @@ -1,3 +1,10 @@ +cockpit-navigator (0.5.1-1focal) focal; urgency=medium + + * Allow modal popups to scroll if overflowing past page. + * Moves focus to next input in modal popup when enter is pressed. + + -- Josh Boudreau Thu, 15 Jul 2021 13:29:15 -0300 + cockpit-navigator (0.5.0-1focal) focal; urgency=medium * Implement custom modal style popups to replace browser dialogs.