From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Nov 2010 13:23:47 +0000 (+0300)
Subject: dialog handling tweaks
X-Git-Tag: 1.5.0~194
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c0f215b0e2e927a024063eca79985fddf9f2b76e;p=tt-rss.git

dialog handling tweaks
---

diff --git a/functions.js b/functions.js
index 40779a06..4a6d09d4 100644
--- a/functions.js
+++ b/functions.js
@@ -394,10 +394,8 @@ function closeInfoBox(cleanup) {
 
 		var dialog = dialogs.pop();
 
-		if (dialog) {
-			dialog.attr('content', '');
+		if (dialog)
 			dialog.hide();
-		}
 
 	} catch (e) {
 		//exception_error("closeInfoBox", e);
@@ -410,8 +408,10 @@ function displayDlg(id, param, callback) {
 
 	notify_progress("Loading, please wait...", true);
 
-	while (dialogs.length > 0)
-		closeInfoBox();
+	if (dijit.byId("infoBox")) {
+		dialogs.pop();
+		dijit.byId("infoBox").destroy();
+	}
 
 	var query = "?op=dlg&id=" +
 		param_escape(id) + "&param=" + param_escape(param);
@@ -467,20 +467,18 @@ function infobox_callback2(transport) {
 
 		var dialog = new dijit.Dialog({
 			title: title,
+			id: 'infoBox',
 			style: "width: 600px",
 			onCancel: function() {
 				dialogs.remove(this);
-				this.attr('content', '');
 				return true;
 			},
 			onExecute: function() {
 				dialogs.remove(this);
-				this.attr('content', '');
 				return true;
 			},
 			onClose: function() {
 				dialogs.remove(this);
-				this.attr('content', '');
 				return true;
 			},
 			content: content});