switch to HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM2

2 files changed, 24 insertions, 9 deletions

diff --git a/init.js b/init.js
index 4a95572..dd5e0aa 100644
--- a/init.js
+++ b/init.js
@@ -1,6 +1,14 @@
-/* global Plugins, Headlines, xhr, dojo, fox, __ */
+/* global require, PluginHost, Plugins, Headlines, xhr, dojo, fox, __ */
 
 Plugins.Mailto = {
+	init: function() {
+		PluginHost.register(PluginHost.HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM2, (action) => {
+			if (action == "Plugins.Mailto.send()")
+				this.send();
+
+				return true;
+		});
+	},
 	send: function (id) {
 		if (!id) {
 			const ids = Headlines.getSelected();
@@ -31,9 +39,16 @@ Plugins.Mailto = {
 	}
 };
 
-// override default hotkey action if enabled
-Plugins.Mail = Plugins.Mail || {};
+require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready, script) {
+	ready(function() {
 
-Plugins.Mail.onHotkey = function(id) {
-	Plugins.Mailto.send(id);
-};
+		// override default hotkey action if enabled
+		Plugins.Mail = Plugins.Mail || {};
+
+		Plugins.Mail.onHotkey = function(id) {
+			Plugins.Mailto.send(id);
+		};
+
+		Plugins.Mailto.init();
+	})
+});
diff --git a/init.php b/init.php
index 83aaf20..2e7193d 100644
--- a/init.php
+++ b/init.php
@@ -9,11 +9,11 @@ class MailTo extends Plugin {
 
 	function init($host) {
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
-		$host->add_hook($host::HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM, $this);
+		$host->add_hook($host::HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM2, $this);
 	}
 
-	function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) {
-		return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email (mailto:)')."</div>";
+	function hook_headline_toolbar_select_menu_item2($feed_id, $is_cat) {
+		return "<option value='Plugins.Mailto.send()'>".__('Forward by email (mailto:)')."</option>";
 	}
 
 	function get_js() {