summaryrefslogtreecommitdiffstats
path: root/web_src/js/components
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2023-01-13 05:50:32 +0000
committerGitHub <noreply@github.com>2023-01-13 13:50:32 +0800
commitc0da3638e71eb9a8a38b89fbfa78603064bf8799 (patch)
tree527feb60f5d991cd67abe25418d94b3d94a99f6b /web_src/js/components
parent99cf0d394ea1f949b72aef2c25e74e67a4ca1791 (diff)
downloadgitea-c0da3638e71eb9a8a38b89fbfa78603064bf8799.tar.gz
gitea-c0da3638e71eb9a8a38b89fbfa78603064bf8799.zip
Restore function to "Show more" buttons (#22399)
There was a serious regression in #21012 which broke the Show More button on the diff page, and the show more button was also broken on the file tree too. This PR fixes this by resetting the pageData.diffFiles as the vue watched value and reattachs a function to the show more button outside of the file tree view. Fix #22380 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: John Olheiser <john.olheiser@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'web_src/js/components')
-rw-r--r--web_src/js/components/DiffFileTree.vue5
1 files changed, 4 insertions, 1 deletions
diff --git a/web_src/js/components/DiffFileTree.vue b/web_src/js/components/DiffFileTree.vue
index e592574ac1..6d77b20241 100644
--- a/web_src/js/components/DiffFileTree.vue
+++ b/web_src/js/components/DiffFileTree.vue
@@ -8,7 +8,7 @@
<DiffFileTreeItem v-for="item in fileTree" :key="item.name" :item="item" />
</div>
<div v-if="isIncomplete" id="diff-too-many-files-stats" class="pt-2">
- <span>{{ tooManyFilesMessage }}</span><a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a>
+ <span class="mr-2">{{ tooManyFilesMessage }}</span><a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a>
</div>
</div>
</template>
@@ -94,6 +94,9 @@ export default {
mounted() {
// ensure correct buttons when we are mounted to the dom
this.adjustToggleButton(this.fileTreeIsVisible);
+ // replace the pageData.diffFileInfo.files with our watched data so we get updates
+ pageData.diffFileInfo.files = this.files;
+
document.querySelector('.diff-toggle-file-tree-button').addEventListener('click', this.toggleVisibility);
},
unmounted() {