diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/app.js | 4 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
| -rw-r--r-- | apps/files/js/mainfileinfodetailview.js | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/apps/files/js/app.js b/apps/files/js/app.js index adb1893bb0e..f31770466fe 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -162,6 +162,7 @@ dir: '/' }; this._changeUrl(params.view, params.dir); + OC.Apps.hideAppSidebar($('.detailsView')); this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params)); } }, @@ -181,6 +182,9 @@ */ _onChangeViewerMode: function(e) { var state = !!e.viewerModeEnabled; + if (e.viewerModeEnabled) { + OC.Apps.hideAppSidebar($('.detailsView')); + } $('#app-navigation').toggleClass('hidden', state); $('.app-files').toggleClass('viewer-mode no-sidebar', state); }, diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index e294e2f3c09..ac96d587015 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -339,7 +339,7 @@ } if (!fileName) { - OC.Apps.hideAppSidebar(); + OC.Apps.hideAppSidebar(this._detailsView.$el); this._detailsView.setFileInfo(null); this._currentFileModel = null; return; @@ -354,7 +354,7 @@ this._detailsView.setFileInfo(model); this._detailsView.$el.scrollTop(0); - _.defer(OC.Apps.showAppSidebar); + _.defer(OC.Apps.showAppSidebar, this._detailsView.$el); }, /** 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'), |