diff options
| author | Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> | 2019-07-09 17:38:14 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-09 17:38:14 +0900 |
| commit | a59ab79da083feeec57b60d4d3bfb6849147ecf1 (patch) | |
| tree | 87195557d0c69973e1a3a2d7e9d133b1ac2845d4 /src/client | |
| parent | Update doc (diff) | |
| download | sharkey-a59ab79da083feeec57b60d4d3bfb6849147ecf1.tar.gz sharkey-a59ab79da083feeec57b60d4d3bfb6849147ecf1.tar.bz2 sharkey-a59ab79da083feeec57b60d4d3bfb6849147ecf1.zip | |
Fix drive browser showing false empty (#5127)
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/desktop/views/components/drive.vue | 6 | ||||
| -rw-r--r-- | src/client/app/mobile/views/components/drive.vue | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/client/app/desktop/views/components/drive.vue b/src/client/app/desktop/views/components/drive.vue index a78c0040c3..ff4ff18e6e 100644 --- a/src/client/app/desktop/views/components/drive.vue +++ b/src/client/app/desktop/views/components/drive.vue @@ -22,19 +22,19 @@ > <div class="selection" ref="selection"></div> <div class="contents" ref="contents"> - <div class="folders" ref="foldersContainer" v-if="folders.length > 0"> + <div class="folders" ref="foldersContainer" v-if="folders.length > 0 || moreFolders"> <x-folder v-for="folder in folders" :key="folder.id" class="folder" :folder="folder"/> <!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid --> <div class="padding" v-for="n in 16"></div> <ui-button v-if="moreFolders">{{ $t('@.load-more') }}</ui-button> </div> - <div class="files" ref="filesContainer" v-if="files.length > 0"> + <div class="files" ref="filesContainer" v-if="files.length > 0 || moreFiles"> <x-file v-for="file in files" :key="file.id" class="file" :file="file"/> <!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid --> <div class="padding" v-for="n in 16"></div> <ui-button v-if="moreFiles" @click="fetchMoreFiles">{{ $t('@.load-more') }}</ui-button> </div> - <div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching"> + <div class="empty" v-if="files.length == 0 && !moreFiles && folders.length == 0 && !moreFolders && !fetching"> <p v-if="draghover">{{ $t('empty-draghover') }}</p> <p v-if="!draghover && folder == null"><strong>{{ $t('empty-drive') }}</strong><br/>{{ $t('empty-drive-description') }}</p> <p v-if="!draghover && folder != null">{{ $t('empty-folder') }}</p> diff --git a/src/client/app/mobile/views/components/drive.vue b/src/client/app/mobile/views/components/drive.vue index 2613cfff99..f24c8492e5 100644 --- a/src/client/app/mobile/views/components/drive.vue +++ b/src/client/app/mobile/views/components/drive.vue @@ -25,17 +25,17 @@ <template v-if="folder.filesCount > 0">{{ folder.filesCount }} {{ $t('file-count') }}</template> </p> </div> - <div class="folders" v-if="folders.length > 0"> + <div class="folders" v-if="folders.length > 0 || moreFolders"> <x-folder class="folder" v-for="folder in folders" :key="folder.id" :folder="folder"/> <p v-if="moreFolders">{{ $t('@.load-more') }}</p> </div> - <div class="files" v-if="files.length > 0"> + <div class="files" v-if="files.length > 0 || moreFiles"> <x-file class="file" v-for="file in files" :key="file.id" :file="file"/> <button class="more" v-if="moreFiles" @click="fetchMoreFiles"> {{ fetchingMoreFiles ? this.$t('@.loading') : this.$t('@.load-more') }} </button> </div> - <div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching"> + <div class="empty" v-if="files.length == 0 && !moreFiles && folders.length == 0 && !moreFolders && !fetching"> <p v-if="folder == null">{{ $t('nothing-in-drive') }}</p> <p v-if="folder != null">{{ $t('folder-is-empty') }}</p> </div> |