plugins: mail, mailto: remove code from global context

classes/feeds.php

@@ -124,12 +124,12 @@ class Feeds extends Handler_Protected {
 		}
 
 		if (PluginHost::getInstance()->get_plugin("mail")) {
-			$reply .= "<option value=\"emailArticle(false)\">".__('Forward by email').
+			$reply .= "<option value=\"Plugins.Mail.send()\">".__('Forward by email').
 				"</option>";
 		}
 
 		if (PluginHost::getInstance()->get_plugin("mailto")) {
-			$reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email').
+			$reply .= "<option value=\"Plugins.Mailto.send()\">".__('Forward by email').
 				"</option>";
 		}
 

js/tt-rss.js

@@ -302,12 +302,10 @@ require(["dojo/_base/kernel",
 						}
 					};
 					this.hotkey_actions["email_article"] = function () {
-						if (typeof emailArticle != "undefined") {
-							emailArticle();
-						} else if (typeof mailtoArticle != "undefined") {
-							mailtoArticle();
+						if (typeof Plugins.Mail != "undefined") {
+							Plugins.Mail.onHotkey(Headlines.getSelected());
 						} else {
-							alert(__("Please enable mail plugin first."));
+							alert(__("Please enable mail or mailto plugin first."));
 						}
 					};
 					this.hotkey_actions["select_all"] = function () {

plugins/mail/init.php

@@ -72,7 +72,7 @@ class Mail extends Plugin {
 	function hook_article_button($line) {
 		return "<img src=\"plugins/mail/mail.png\"
 					class='tagsPic' style=\"cursor : pointer\"
-					onclick=\"emailArticle(".$line["id"].")\"
+					onclick=\"Plugins.Mail.send(".$line["id"].")\"
 					alt='Zoom' title='".__('Forward by email')."'>";
 	}
 

plugins/mail/mail.js

@@ -1,4 +1,5 @@
-function emailArticle(id) {
+Plugins.Mail = {
+	send: function(id) {
 		if (!id) {
 			let ids = Headlines.getSelected();
 
@@ -19,7 +20,7 @@ function emailArticle(id) {
 			id: "emailArticleDlg",
 			title: __("Forward article by email"),
 			style: "width: 600px",
-		execute: function() {
+			execute: function () {
 				if (this.validate()) {
 					xhrJson("backend.php", this.attr('value'), (reply) => {
 						if (reply) {
@@ -36,7 +37,8 @@ function emailArticle(id) {
 					});
 				}
 			},
-		href: query});
+			href: query
+		});
 
 		/* var tmph = dojo.connect(dialog, 'onLoad', function() {
 		dojo.disconnect(tmph);
@@ -47,6 +49,8 @@ function emailArticle(id) {
 		}); */
 
 		dialog.show();
-}
-
-
+	},
+	onHotkey: function(id) {
+		Plugins.Mail.send(id);
+	}
+};

plugins/mailto/init.js

@@ -1,4 +1,5 @@
-function mailtoArticle(id) {
+Plugins.Mailto = {
+	send: function (id) {
 		if (!id) {
 			const ids = Headlines.getSelected();
 
@@ -22,6 +23,12 @@ function mailtoArticle(id) {
 			href: query});
 
 		dialog.show();
-}
+	}
+};
 
+// override default hotkey action if enabled
+Plugins.Mail = Plugins.Mail || {};
 
+Plugins.Mail.onHotkey = function(id) {
+	Plugins.Mailto.send(id);
+};

plugins/mailto/init.php

@@ -21,7 +21,7 @@ class MailTo extends Plugin {
 	function hook_article_button($line) {
 		return "<img src=\"plugins/mailto/mail.png\"
 					class='tagsPic' style=\"cursor : pointer\"
-					onclick=\"mailtoArticle(".$line["id"].")\"
+					onclick=\"Plugins.Mailto.send(".$line["id"].")\"
 					alt='Zoom' title='".__('Forward by email')."'>";
 	}