From ba7c7608c0441bf51eb9a8489035169b53cc24f5 Mon Sep 17 00:00:00 2001 From: Victor Seiji Hariki Date: Fri, 9 Dec 2022 23:18:24 -0300 Subject: [PATCH 1/4] index 0 not counted as an image anymore Signed-off-by: Victor Seiji Hariki --- js/ui/tool/dream.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/ui/tool/dream.js b/js/ui/tool/dream.js index fdd5733..a2893d5 100644 --- a/js/ui/tool/dream.js +++ b/js/ui/tool/dream.js @@ -222,7 +222,7 @@ const _generate = async ( at--; if (at < 0) at = images.length - 1; - imageindextxt.textContent = `${at}/${images.length}`; + imageindextxt.textContent = `${at}/${images.length - 1}`; redraw(); }; @@ -230,7 +230,7 @@ const _generate = async ( at++; if (at >= images.length) at = 0; - imageindextxt.textContent = `${at}/${images.length}`; + imageindextxt.textContent = `${at}/${images.length - 1}`; redraw(); }; @@ -256,7 +256,7 @@ const _generate = async ( interruptButton.disabled = false; imageCollection.inputElement.appendChild(interruptButton); images.push(...(await _dream(endpoint, requestCopy))); - imageindextxt.textContent = `${at}/${images.length}`; + imageindextxt.textContent = `${at}/${images.length - 1}`; } catch (e) { alert( `Error generating images. Please try again or see consolde for more details` @@ -330,11 +330,11 @@ const _generate = async ( imageSelectMenu = makeElement("div", bb.x, bb.y + bb.h); const imageindextxt = document.createElement("button"); - imageindextxt.textContent = `${at}/${images.length}`; + imageindextxt.textContent = `${at}/${images.length - 1}`; imageindextxt.addEventListener("click", () => { at = 0; - imageindextxt.textContent = `${at}/${images.length}`; + imageindextxt.textContent = `${at}/${images.length - 1}`; redraw(); }); From 4563694b1b1eebeee10d5ff2e8466a56d8fc929e Mon Sep 17 00:00:00 2001 From: tim h Date: Fri, 9 Dec 2022 20:59:20 -0600 Subject: [PATCH 2/4] more don't merge --- deleteme.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 deleteme.txt diff --git a/deleteme.txt b/deleteme.txt new file mode 100644 index 0000000..429bb70 --- /dev/null +++ b/deleteme.txt @@ -0,0 +1 @@ +go away \ No newline at end of file From d04a8b0e5018d370d7e78d69e873a7c554ffaf08 Mon Sep 17 00:00:00 2001 From: tim h Date: Fri, 9 Dec 2022 21:00:32 -0600 Subject: [PATCH 3/4] Revert "more don't merge" This reverts commit 4563694b1b1eebeee10d5ff2e8466a56d8fc929e. --- deleteme.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 deleteme.txt diff --git a/deleteme.txt b/deleteme.txt deleted file mode 100644 index 429bb70..0000000 --- a/deleteme.txt +++ /dev/null @@ -1 +0,0 @@ -go away \ No newline at end of file From e3c77f433ad92057c2691cad4d8efaa168eded59 Mon Sep 17 00:00:00 2001 From: Victor Seiji Hariki Date: Sat, 10 Dec 2022 08:18:35 -0300 Subject: [PATCH 4/4] try fixing external pull request checkout - test1 Signed-off-by: Victor Seiji Hariki --- .github/workflows/autoformat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autoformat.yml b/.github/workflows/autoformat.yml index 95bb459..289e101 100644 --- a/.github/workflows/autoformat.yml +++ b/.github/workflows/autoformat.yml @@ -13,9 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - ref: ${{ github.head_ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: Prettify uses: creyD/prettier_action@v4.2 with: