diff options
Diffstat (limited to 'apps/files/js/fileactions.js')
| -rw-r--r-- | apps/files/js/fileactions.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 6b95e3ee6cd..0d9161c6eb4 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -332,10 +332,8 @@ * @param {OCA.Files.FileActionContext} context rendering context */ _showMenu: function(fileName, context) { - var $actionEl = context.$file.find('.action-menu'); - this._menu = new OCA.Files.FileActionsMenu(); - this._menu.showAt($actionEl, context); + this._menu.showAt(context); }, /** @@ -433,7 +431,7 @@ nameLinks = parent.children('a.name'); nameLinks.find('.fileactions, .nametext .action').remove(); nameLinks.append('<span class="fileactions" />'); - var defaultAction = this.getDefault( + var defaultAction = this.getDefaultFileAction( this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions() @@ -449,7 +447,7 @@ if (actionSpec.type === FileActions.TYPE_INLINE) { self._renderInlineAction( actionSpec, - actionSpec.action === defaultAction, + defaultAction && actionSpec.name === defaultAction.name, context ); } |