From d466284fabe945dbc3c8034ac1468bf97b38ed94 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 12 Feb 2021 09:02:44 +0300
Subject: * customizeCSS: client dialog * remove hardcoded width from most
 dialogs (move to css) * add helper to easily get dialog from its widget *
 rework some dialog buttons to use current object instead of calling dialog by
 name

---
 plugins/af_psql_trgm/init.js  | 11 ++++-------
 plugins/af_psql_trgm/init.php |  6 +++---
 plugins/mail/mail.js          |  1 -
 plugins/mailto/init.js        |  1 -
 plugins/note/note.js          |  1 -
 plugins/share/init.php        |  6 +++---
 plugins/share/share.js        |  1 -
 7 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js
index af337ca6b..a22e673f6 100644
--- a/plugins/af_psql_trgm/init.js
+++ b/plugins/af_psql_trgm/init.js
@@ -1,16 +1,13 @@
+/* global dijit, Plugins, __ */
+
 Plugins.Psql_Trgm = {
 	showRelated: function (id) {
 		const query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated&param=" + encodeURIComponent(id);
 
-		if (dijit.byId("trgmRelatedDlg"))
-			dijit.byId("trgmRelatedDlg").destroyRecursive();
-
-		dialog = new dijit.Dialog({
-			id: "trgmRelatedDlg",
+		const dialog = new dijit.Dialog({
 			title: __("Related articles"),
-			style: "width: 600px",
 			execute: function () {
-
+				//
 			},
 			href: query,
 		});
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index faacf2da7..163b0ec38 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -108,9 +108,9 @@ class Af_Psql_Trgm extends Plugin {
 
 		}
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('trgmRelatedDlg').hide()\">".__('Close this window')."</button>";
-		print "</footer>";
+		print "<footer class='text-center'>
+			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__('Close this window')."</button>
+		</footer>";
 
 
 	}
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index eb7b7e6b6..89e395221 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -19,7 +19,6 @@ Plugins.Mail = {
 		const dialog = new dijit.Dialog({
 			id: "emailArticleDlg",
 			title: __("Forward article by email"),
-			style: "width: 600px",
 			execute: function () {
 				if (this.validate()) {
 					xhrJson("backend.php", this.attr('value'), (reply) => {
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index f81f70fc7..6a1d2ef19 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -19,7 +19,6 @@ Plugins.Mailto = {
 		const dialog = new dijit.Dialog({
 			id: "emailArticleDlg",
 			title: __("Forward article by email"),
-			style: "width: 600px",
 			href: query});
 
 		dialog.show();
diff --git a/plugins/note/note.js b/plugins/note/note.js
index 0c811000d..fec7b04be 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -8,7 +8,6 @@ Plugins.Note = {
 		const dialog = new dijit.Dialog({
 			id: "editNoteDlg",
 			title: __("Edit article note"),
-			style: "width: 600px",
 			execute: function () {
 				if (this.validate()) {
 					Notify.progress("Saving article note...", true);
diff --git a/plugins/share/init.php b/plugins/share/init.php
index d0b3dfc0b..0794f5125 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -123,13 +123,13 @@ class Share extends Plugin {
 
 		print "<footer class='text-center'>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').unshare()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return App.dialogOf(this).unshare()\">".
 			__('Unshare article')."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').newurl()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return App.dialogOf(this).newurl()\">".
 			__('Generate new URL')."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').hide()\">".
+		print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
 			__('Close this window')."</button>";
 
 		print "</footer>";
diff --git a/plugins/share/share.js b/plugins/share/share.js
index c49f64b4b..507f27f84 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -8,7 +8,6 @@ Plugins.Share = {
 		const dialog = new dijit.Dialog({
 			id: "shareArticleDlg",
 			title: __("Share article by URL"),
-			style: "width: 600px",
 			newurl: function () {
 				if (confirm(__("Generate new share URL for this article?"))) {
 
-- 
cgit v1.2.3-54-g00ecf