mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed sidebar toggle entry 

Properly highlight the row after selecting the item.
This also fixes the unit tests by changing the order of registration of
file actions.
This commit is contained in:
Vincent Petry 2015-09-02 10:41:08 +02:00
parent 8a6574e81a
commit d0cea82969
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
apps/files/js/filelist.js
View File

@ -193,7 +193,19 @@
this.$container = options.scrollContainer || $(window);
this.$table = $el.find('table:first');
this.$fileList = $el.find('#fileList');
if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
this._detailsView = new OCA.Files.DetailsView();
this._detailsView.$el.insertBefore(this.$el);
this._detailsView.$el.addClass('disappear');
}
this._initFileActions(options.fileActions);
if (this._detailsView) {
this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView({fileList: this, fileActions: this.fileActions}));
}
this.files = [];
this._selectedFiles = {};
this._selectionSummary = new OCA.Files.FileSummary();
@ -214,24 +226,6 @@
}
this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions);
if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
this._detailsView = new OCA.Files.DetailsView();
this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView({fileList: this, fileActions: this.fileActions}));
this._detailsView.$el.insertBefore(this.$el);
this._detailsView.$el.addClass('disappear');
this.fileActions.registerAction({
name: 'Details',
mime: 'all',
permissions: OC.PERMISSION_READ,
actionHandler: function(fileName, context) {
var fileInfo = self.elementToFile(context.$file);
self._updateDetailsView(fileInfo);
OC.Apps.showAppSidebar();
}
});
}
this.$el.find('#controls').prepend(this.breadcrumb.$el);
this._renderNewButton();
@ -296,11 +290,25 @@
* @param {OCA.Files.FileActions} fileActions file actions
*/
_initFileActions: function(fileActions) {
var self = this;
this.fileActions = fileActions;
if (!this.fileActions) {
this.fileActions = new OCA.Files.FileActions();
this.fileActions.registerDefaultActions();
}
if (this._detailsView) {
this.fileActions.registerAction({
name: 'Details',
mime: 'all',
permissions: OC.PERMISSION_READ,
actionHandler: function(fileName, context) {
self._updateDetailsView(fileName);
OC.Apps.showAppSidebar();
}
});
}
this._onFileActionsUpdated = _.debounce(_.bind(this._onFileActionsUpdated, this), 100);
this.fileActions.on('registerAction', this._onFileActionsUpdated);
this.fileActions.on('setDefault', this._onFileActionsUpdated);