From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 8 Nov 2012 14:31:14 +0000 (+0400)
Subject: fix batchSubDlg and feedAddDlg not working properly if invoked one after another... 
X-Git-Tag: 1.6.1~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c714cee73bb3f4f6a449c0f45e195026aca4f1a6;p=tt-rss.git

fix batchSubDlg and feedAddDlg not working properly if invoked one after another because of overlapping widgets
---

diff --git a/js/functions.js b/js/functions.js
index e9dcf3f3..e80c860e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -838,8 +838,9 @@ function quickAddFeed() {
 	try {
 		var query = "backend.php?op=dlg&method=quickAddFeed";
 
-		if (dijit.byId("feedAddDlg"))
-			dijit.byId("feedAddDlg").destroyRecursive();
+		// overlapping widgets
+		if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
+		if (dijit.byId("feedAddDlg"))	dijit.byId("feedAddDlg").destroyRecursive();
 
 		var dialog = new dijit.Dialog({
 			id: "feedAddDlg",
diff --git a/js/prefs.js b/js/prefs.js
index ded6c345..1d21e0cd 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -2177,8 +2177,9 @@ function batchSubscribe() {
 	try {
 		var query = "backend.php?op=dlg&method=batchSubscribe";
 
-		if (dijit.byId("batchSubDlg"))
-			dijit.byId("batchSubDlg").destroyRecursive();
+		// overlapping widgets
+		if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
+		if (dijit.byId("feedAddDlg"))	dijit.byId("feedAddDlg").destroyRecursive();
 
 		var dialog = new dijit.Dialog({
 			id: "batchSubDlg",