summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-22 10:42:15 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-22 10:42:15 +0200
commitbbea8c3545e29609cdac8e5602d36ecc422710d6 (patch)
treefde3edc61cc01b069c020c40c039bc441f45f6c6 /apps/files
parent56fdb0ac939ce896e4bf89849f31787154abd221 (diff)
parente36c85178f446c1b8c570ad52206f19523a823f8 (diff)
downloadnextcloud-server-bbea8c3545e29609cdac8e5602d36ecc422710d6.tar.gz
nextcloud-server-bbea8c3545e29609cdac8e5602d36ecc422710d6.zip
Merge pull request #19937 from owncloud/detailsview-donotopenonrename
Do not display details bar after rename
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/filelist.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4f5fdf242d9..c84d6c3c47d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -390,12 +390,15 @@
* Update the details view to display the given file
*
* @param {string} fileName file name from the current list
+ * @param {boolean} [show=true] whether to open the sidebar if it was closed
*/
- _updateDetailsView: function(fileName) {
+ _updateDetailsView: function(fileName, show) {
if (!this._detailsView) {
return;
}
+ // show defaults to true
+ show = _.isUndefined(show) || !!show;
var oldFileInfo = this._detailsView.getFileInfo();
if (oldFileInfo) {
// TODO: use more efficient way, maybe track the highlight
@@ -413,7 +416,7 @@
return;
}
- if (this._detailsView.$el.hasClass('disappear')) {
+ if (show && this._detailsView.$el.hasClass('disappear')) {
OC.Apps.showAppSidebar(this._detailsView.$el);
}
@@ -1771,7 +1774,7 @@
tr.remove();
tr = self.add(fileInfo, {updateSummary: false, silent: true});
self.$fileList.trigger($.Event('fileActionsReady', {fileList: self, $files: $(tr)}));
- self._updateDetailsView(fileInfo.name);
+ self._updateDetailsView(fileInfo.name, false);
}
});
} else {