remove some plugin JS code out of global context

3 files changed, 26 insertions, 28 deletions

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 94571bb1b..6ac08b751 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -40,7 +40,7 @@ class Share extends Plugin {
 
 			print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
 
-			print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
+			print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Plugins.Share.clearKeys()\">".
 				__('Unshare all articles')."</button> ";
 
 			print "</p>";
@@ -74,7 +74,7 @@ class Share extends Plugin {
 
 		return "<img id='SHARE-IMG-".$line['int_id']."' src=\"plugins/share/$img\"
 			class='tagsPic' style=\"cursor : pointer\"
-			onclick=\"shareArticle(".$line['int_id'].")\"
+			onclick=\"Plugins.Share.shareArticle(".$line['int_id'].")\"
 			title='".__('Share by URL')."'>";
 	}
 
diff --git a/plugins/share/share.js b/plugins/share/share.js
index a22e01715..7366c2aff 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -1,20 +1,20 @@
-function shareArticle(id) {
-	try {
+Plugins.Share = {
+	shareArticle: function(id) {
 		if (dijit.byId("shareArticleDlg"))
 			dijit.byId("shareArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
+		const query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
 
-		dialog = new dijit.Dialog({
+		const dialog = new dijit.Dialog({
 			id: "shareArticleDlg",
 			title: __("Share article by URL"),
 			style: "width: 600px",
-			newurl: function() {
+			newurl: function () {
 				if (confirm(__("Generate new share URL for this article?"))) {
 
 					Notify.progress("Trying to change URL...", true);
 
-					const query = { op: "pluginhandler", plugin: "share", method: "newkey", id: id };
+					const query = {op: "pluginhandler", plugin: "share", method: "newkey", id: id};
 
 					xhrJson("backend.php", query, (reply) => {
 						if (reply) {
@@ -44,12 +44,12 @@ function shareArticle(id) {
 				}
 
 			},
-			unshare: function() {
+			unshare: function () {
 				if (confirm(__("Remove sharing for this article?"))) {
 
 					Notify.progress("Trying to unshare...", true);
 
-					const query = { op: "pluginhandler", plugin: "share", method: "unshare", id: id };
+					const query = {op: "pluginhandler", plugin: "share", method: "unshare", id: id};
 
 					xhrPost("backend.php", query, () => {
 						notify("Article unshared.");
@@ -62,16 +62,15 @@ function shareArticle(id) {
 				}
 
 			},
-			href: query});
+			href: query
+		});
 
 		dialog.show();
 
 		const img = $("SHARE-IMG-" + id);
 		if (img) img.src = img.src.replace("notshared.png", "share.png");
-
-	} catch (e) {
-		exception_error("shareArticle", e);
 	}
-}
+};
+
 
 
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
index 92975f8f4..071a6667c 100644
--- a/plugins/share/share_prefs.js
+++ b/plugins/share/share_prefs.js
@@ -1,16 +1,15 @@
-function clearArticleAccessKeys() {
-	if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
-		Notify.progress("Clearing URLs...");
-
-		const query = { op: "pluginhandler", plugin: "share", method: "clearArticleKeys" };
-
-		xhrPost("backend.php", query, () => {
-			Notify.info("Shared URLs cleared.");
-		});
-	}
-
-	return false;
-}
+Plugins.Share = {
+	clearKeys: function() {
+		if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
+			Notify.progress("Clearing URLs...");
 
+			const query = {op: "pluginhandler", plugin: "share", method: "clearArticleKeys"};
 
+			xhrPost("backend.php", query, () => {
+				Notify.info("Shared URLs cleared.");
+			});
+		}
 
+		return false;
+	}
+};