From 34a08170c894321d49bb843e259a0e59e2245998 Mon Sep 17 00:00:00 2001 From: zoui <56403136+Zouizoui78@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:01:41 +0100 Subject: [PATCH 1/6] fix: editor discard prompt (#2990) --- frontend/src/views/files/Editor.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/files/Editor.vue b/frontend/src/views/files/Editor.vue index e85ffa3b..bf0d47e2 100644 --- a/frontend/src/views/files/Editor.vue +++ b/frontend/src/views/files/Editor.vue @@ -129,6 +129,7 @@ export default { try { await api.put(this.$route.path, this.editor.getValue()); + this.editor.session.getUndoManager().markClean(); buttons.success(button); } catch (e) { buttons.done(button); @@ -136,9 +137,7 @@ export default { } }, close() { - const originalContent = this.req.content; - const currentContent = this.editor.getValue(); - if (originalContent !== currentContent) { + if (!this.editor.session.getUndoManager().isClean()) { this.$store.commit("showHover", "discardEditorChanges"); return; } From d5487ba6fa8d21f0b90acbabfd6163f697e1e99e Mon Sep 17 00:00:00 2001 From: Feriman Date: Fri, 9 Feb 2024 11:03:06 +0100 Subject: [PATCH 2/6] chore: add noindex (#2981) --- frontend/public/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/public/index.html b/frontend/public/index.html index 39d926d8..530da7cf 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -16,6 +16,8 @@ [{[ if .Name -]}][{[ .Name ]}][{[ else ]}]File Browser[{[ end ]}] + + Date: Fri, 9 Feb 2024 12:04:02 +0200 Subject: [PATCH 3/6] fix: shell direction (#2980) --- frontend/src/components/Shell.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Shell.vue b/frontend/src/components/Shell.vue index 844c496f..4da32041 100644 --- a/frontend/src/components/Shell.vue +++ b/frontend/src/components/Shell.vue @@ -2,7 +2,7 @@
Date: Fri, 9 Feb 2024 19:05:09 +0900 Subject: [PATCH 4/6] chore: update github action versions (#2977) --- .github/workflows/main.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c504686a..ff6ea28d 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -13,26 +13,26 @@ jobs: lint-frontend: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: '18' - run: make lint-frontend lint-backend: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: go-version: 1.21.0 - run: make lint-backend lint-commits: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '18' - run: make lint-commits @@ -46,16 +46,16 @@ jobs: test-frontend: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: '18' - run: make test-frontend test-backend: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: go-version: 1.21.0 - run: make test-backend @@ -71,13 +71,13 @@ jobs: needs: [lint, test] if: startsWith(github.event.ref, 'refs/tags/v') steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v5 with: go-version: 1.21.0 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '18' - name: Set up QEMU From fe5ca74aa1e4257e5cb36f1de58daa0c3548319f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AD=E3=82=89=E3=81=B2=E3=81=8B=E3=81=A0?= Date: Fri, 9 Feb 2024 19:05:35 +0900 Subject: [PATCH 5/6] fix: fix lint warnings (#2976) --- frontend/src/components/files/ListingItem.vue | 7 ++++++- frontend/src/components/prompts/Copy.vue | 4 ++-- frontend/src/components/prompts/Info.vue | 7 +++---- frontend/src/components/prompts/Move.vue | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue index 944ad9b1..f7733b87 100644 --- a/frontend/src/components/files/ListingItem.vue +++ b/frontend/src/components/files/ListingItem.vue @@ -191,7 +191,12 @@ export default { action(overwrite, rename); }, itemClick: function (event) { - if (!(event.ctrlKey || event.metaKey) && this.singleClick && !this.$store.state.multiple) this.open(); + if ( + !(event.ctrlKey || event.metaKey) && + this.singleClick && + !this.$store.state.multiple + ) + this.open(); else this.click(event); }, click: function (event) { diff --git a/frontend/src/components/prompts/Copy.vue b/frontend/src/components/prompts/Copy.vue index 46166108..6e3d6805 100644 --- a/frontend/src/components/prompts/Copy.vue +++ b/frontend/src/components/prompts/Copy.vue @@ -12,7 +12,7 @@