diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/detailsview.js | 7 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js index ac10b8380ef..aed1736693a 100644 --- a/apps/files/js/detailsview.js +++ b/apps/files/js/detailsview.js @@ -118,10 +118,13 @@ */ render: function() { // remove old instances - if ($('#app-sidebar').length === 0) { + var $appSidebar = $('#app-sidebar'); + if ($appSidebar.length === 0) { this.$el.insertAfter($('#app-content')); } else { - $('#app-sidebar').replaceWith(this.$el) + if ($appSidebar[0] !== this.el) { + $appSidebar.replaceWith(this.$el) + } } var templateVars = { diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index f44a36435a1..8e7c60551a1 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -564,7 +564,7 @@ } this._currentFileModel = model; - + this._detailsView.render(); this._detailsView.setFileInfo(model); this._detailsView.$el.scrollTop(0); }, @@ -1623,7 +1623,7 @@ // discard finished uploads list, we'll get it through a regular reload this._uploads = {}; - this.reload().then(function(success){ + return this.reload().then(function(success){ if (!success) { self.changeDirectory(currentDir, true); } |