* OPML import: don't reload everything, just feed tree

* dialogs: use auto-destroying dialog for almost all dialogs instead of destroying them manually
* some general dialog-related cleanup

4 files changed, 16 insertions, 23 deletions

diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index 89e395221..5ddc0dc41 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -1,7 +1,9 @@
+/* global Plugins, Headlines, xhrJson, Notify, fox, __ */
+
 Plugins.Mail = {
 	send: function(id) {
 		if (!id) {
-			let ids = Headlines.getSelected();
+			const ids = Headlines.getSelected();
 
 			if (ids.length == 0) {
 				alert(__("No articles selected."));
@@ -11,12 +13,9 @@ Plugins.Mail = {
 			id = ids.toString();
 		}
 
-		if (dijit.byId("emailArticleDlg"))
-			dijit.byId("emailArticleDlg").destroyRecursive();
-
 		const query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
 
-		const dialog = new dijit.Dialog({
+		const dialog = new fox.SingleUseDialog({
 			id: "emailArticleDlg",
 			title: __("Forward article by email"),
 			execute: function () {
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index 6a1d2ef19..ae68bf49b 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -1,3 +1,5 @@
+/* global Plugins, Headlines, fox, __ */
+
 Plugins.Mailto = {
 	send: function (id) {
 		if (!id) {
@@ -11,12 +13,9 @@ Plugins.Mailto = {
 			id = ids.toString();
 		}
 
-		if (dijit.byId("emailArticleDlg"))
-			dijit.byId("emailArticleDlg").destroyRecursive();
-
 		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
 
-		const dialog = new dijit.Dialog({
+		const dialog = new fox.SingleUseDialog({
 			id: "emailArticleDlg",
 			title: __("Forward article by email"),
 			href: query});
@@ -30,4 +29,4 @@ Plugins.Mail = Plugins.Mail || {};
 
 Plugins.Mail.onHotkey = function(id) {
 	Plugins.Mailto.send(id);
-};
\ No newline at end of file
+};
diff --git a/plugins/note/note.js b/plugins/note/note.js
index fec7b04be..ab2ed9208 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,11 +1,10 @@
+/* global Plugins, xhrJson, Notify, fox, __ */
+
 Plugins.Note = {
 	edit: function(id) {
 		const query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
 
-		if (dijit.byId("editNoteDlg"))
-			dijit.byId("editNoteDlg").destroyRecursive();
-
-		const dialog = new dijit.Dialog({
+		const dialog = new fox.SingleUseDialog({
 			id: "editNoteDlg",
 			title: __("Edit article note"),
 			execute: function () {
@@ -36,4 +35,4 @@ Plugins.Note = {
 
 		dialog.show();
 	}
-};
\ No newline at end of file
+};
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 507f27f84..3fc42d654 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -1,11 +1,10 @@
+/* global Plugins, xhrJson, Notify, fox, xhrPost, __ */
+
 Plugins.Share = {
 	shareArticle: function(id) {
-		if (dijit.byId("shareArticleDlg"))
-			dijit.byId("shareArticleDlg").destroyRecursive();
-
 		const query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
 
-		const dialog = new dijit.Dialog({
+		const dialog = new fox.SingleUseDialog({
 			id: "shareArticleDlg",
 			title: __("Share article by URL"),
 			newurl: function () {
@@ -73,7 +72,4 @@ Plugins.Share = {
 		const img = $("SHARE-IMG-" + id);
 		img.addClassName("shared");
 	}
-};
-
-
-
+}