From 6d0bf287b5d24b131a86188e1691cf3770fdfc06 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 4 Oct 2017 14:53:09 -0400
Subject: [PATCH] Allow more extensibility for the post menu buttons

---
 .../javascripts/discourse/widgets/link.js.es6 |  6 ++--
 .../discourse/widgets/post-menu.js.es6        | 32 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6
index 5774ccc7635..a762a1e74d3 100644
--- a/app/assets/javascripts/discourse/widgets/link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/link.js.es6
@@ -31,8 +31,10 @@ export default createWidget('link', {
   },
 
   buildAttributes(attrs) {
-    return { href: this.href(attrs),
-             title: attrs.title ? I18n.t(attrs.title) : this.label(attrs) };
+    return {
+      href: this.href(attrs),
+      title: attrs.title ? I18n.t(attrs.title) : this.label(attrs)
+    };
   },
 
   label(attrs) {
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index b36fdb21bb2..f6a0665ca48 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -29,6 +29,18 @@ function registerButton(name, builder) {
   _builders[name] = builder;
 }
 
+export function buildButton(name, widget) {
+  let { attrs, state, siteSettings } = widget;
+  let builder = _builders[name];
+  if (builder) {
+    let button = builder(attrs, state, siteSettings);
+    if (button && !button.id) {
+      button.id = name;
+    }
+    return button;
+  }
+}
+
 registerButton('like', attrs => {
   if (!attrs.showLike) { return; }
   const className = attrs.liked ? 'toggle-like has-like fade-out' : 'toggle-like like';
@@ -181,6 +193,7 @@ registerButton('bookmark', attrs => {
   }
 
   return {
+    id: attrs.bookmarked ? 'bookmark' : 'unbookmark',
     action: 'toggleBookmark',
     title: attrs.bookmarked ? "bookmarks.created" : "bookmarks.not_bookmarked",
     className,
@@ -198,13 +211,13 @@ registerButton('admin', attrs => {
 
 registerButton('delete', attrs => {
   if (attrs.canRecoverTopic) {
-    return { action: 'recoverPost', title: 'topic.actions.recover', icon: 'undo', className: 'recover' };
+    return { id: 'recover_topic', action: 'recoverPost', title: 'topic.actions.recover', icon: 'undo', className: 'recover' };
   } else if (attrs.canDeleteTopic) {
-    return { action: 'deletePost', title: 'topic.actions.delete', icon: 'trash-o', className: 'delete' };
+    return { id: 'delete_topic', action: 'deletePost', title: 'topic.actions.delete', icon: 'trash-o', className: 'delete' };
   } else if (attrs.canRecover) {
-    return { action: 'recoverPost', title: 'post.controls.undelete', icon: 'undo', className: 'recover' };
+    return { id: 'recover', action: 'recoverPost', title: 'post.controls.undelete', icon: 'undo', className: 'recover' };
   } else if (attrs.canDelete) {
-    return { action: 'deletePost', title: 'post.controls.delete', icon: 'trash-o', className: 'delete' };
+    return { action: 'delete', title: 'post.controls.delete', icon: 'trash-o', className: 'delete' };
   }
 });
 
@@ -229,13 +242,10 @@ export default createWidget('post-menu', {
 
   buildKey: attrs => `post-menu-${attrs.id}`,
 
-  attachButton(name, attrs) {
-    const builder = _builders[name];
-    if (builder) {
-      const buttonAtts = builder(attrs, this.state, this.siteSettings);
-      if (buttonAtts) {
-        return this.attach(this.settings.buttonType, buttonAtts);
-      }
+  attachButton(name) {
+    let buttonAtts = buildButton(name, this);
+    if (buttonAtts) {
+      return this.attach(this.settings.buttonType, buttonAtts);
     }
   },