diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-08-25 11:29:35 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-08-25 11:29:35 +0200 |
| commit | 5e6fa3c9389fcfa3af682f12fe0f54918ae6c85d (patch) | |
| tree | 9ad639b3bc6d0a4ac9d9b1207e4ad2ad1f500212 /apps/files/js/mainfileinfodetailview.js | |
| parent | a86602a1575d829a64588b35eb073484ec9543db (diff) | |
| download | nextcloud-server-5e6fa3c9389fcfa3af682f12fe0f54918ae6c85d.tar.gz nextcloud-server-5e6fa3c9389fcfa3af682f12fe0f54918ae6c85d.zip | |
Fix trashbin sidebar
Do not display size as it is not available.
Use display name instead of name to remove the ".d123456" suffix.
Diffstat (limited to 'apps/files/js/mainfileinfodetailview.js')
| -rw-r--r-- | apps/files/js/mainfileinfodetailview.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js index 8bf22149841..513f833299a 100644 --- a/apps/files/js/mainfileinfodetailview.js +++ b/apps/files/js/mainfileinfodetailview.js @@ -17,7 +17,7 @@ ' class="action action-favorite favorite">' + ' <img class="svg" src="{{starIcon}}" />' + ' </a>' + - ' <span class="size" title="{{altSize}}">{{size}}</span>, <span class="date" title="{{altDate}}">{{date}}</span>' + + ' {{#if hasSize}}<span class="size" title="{{altSize}}">{{size}}</span>, {{/if}}<span class="date" title="{{altDate}}">{{date}}</span>' + '</div>'; /** @@ -104,9 +104,10 @@ var isFavorite = (this.model.get('tags') || []).indexOf(OC.TAG_FAVORITE) >= 0; this.$el.html(this.template({ nameLabel: t('files', 'Name'), - name: this.model.get('name'), + name: this.model.get('displayName') || this.model.get('name'), pathLabel: t('files', 'Path'), path: this.model.get('path'), + hasSize: this.model.has('size'), sizeLabel: t('files', 'Size'), size: OC.Util.humanFileSize(this.model.get('size'), true), altSize: n('files', '%n byte', '%n bytes', this.model.get('size')), @@ -120,8 +121,7 @@ // TODO: we really need OC.Previews var $iconDiv = this.$el.find('.thumbnail'); if (!this.model.isDirectory()) { - // TODO: inject utility class? - FileList.lazyLoadPreview({ + this._fileList.lazyLoadPreview({ path: this.model.getFullPath(), mime: this.model.get('mimetype'), etag: this.model.get('etag'), |