From 5e68c5f851e016ad31cea738414c316e495530e8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 8 Apr 2019 15:52:09 +0200
Subject: [PATCH] UX: moves local-dates from popupMenu to toolbar (#7335)

---
 .../initializers/discourse-local-dates.js.es6 | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
index 14a9cab3b2e..28117194f74 100644
--- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
@@ -6,19 +6,22 @@ function initializeDiscourseLocalDates(api) {
     $(".discourse-local-date", $elem).applyLocalDates();
   });
 
-  api.addToolbarPopupMenuOptionsCallback(() => {
-    return {
-      action: "insertDiscourseLocalDate",
-      icon: "globe",
-      label: "discourse_local_dates.title"
-    };
+  api.onToolbarCreate(toolbar => {
+    toolbar.addButton({
+      title: "discourse_local_dates.title",
+      id: "local-dates",
+      group: "extras",
+      icon: "calendar-alt",
+      sendAction: event =>
+        toolbar.context.send("insertDiscourseLocalDate", event)
+    });
   });
 
-  api.modifyClass("controller:composer", {
+  api.modifyClass("component:d-editor", {
     actions: {
-      insertDiscourseLocalDate() {
+      insertDiscourseLocalDate(toolbarEvent) {
         showModal("discourse-local-dates-create-modal").setProperties({
-          toolbarEvent: this.get("toolbarEvent")
+          toolbarEvent
         });
       }
     }