Updated unit tests for file actions and actions menu

2 files changed, 11 insertions, 11 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
 					);
 				}
diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js
index dabf530b177..1795fdeab11 100644
--- a/apps/files/js/fileactionsmenu.js
+++ b/apps/files/js/fileactionsmenu.js
@@ -42,7 +42,7 @@
 		/**
 		 * @private
 		 */
-		initialize: function(fileActions, fileList) {
+		initialize: function() {
 			this.$el = $('<div class="fileActionsMenu dropdown hidden menu"></div>');
 			this._template = Handlebars.compile(TEMPLATE_MENU);
 
@@ -50,6 +50,10 @@
 			this.$el.on('afterHide', _.bind(this._onHide, this));
 		},
 
+		destroy: function() {
+			this.$el.remove();
+		},
+
 		/**
 		 * Event handler whenever an action has been clicked within the menu
 		 *
@@ -118,17 +122,15 @@
 		/**
 		 * Displays the menu under the given element
 		 *
-		 * @param {Object} $el target element
 		 * @param {OCA.Files.FileActionContext} context context
 		 */
-		showAt: function($el, context) {
+		showAt: function(context) {
 			this._context = context;
 
 			this.render();
 			this.$el.removeClass('hidden');
 
-			$el.closest('td').append(this.$el);
-
+			context.$file.find('td.filename').append(this.$el);
 			context.$file.addClass('mouseOver');
 
 			OC.showMenu(null, this.$el);
@@ -139,7 +141,7 @@
 		 */
 		_onHide: function() {
 			this._context.$file.removeClass('mouseOver');
-			this.$el.remove();
+			this.destroy();
 		}
 	};