From f26d5dbbdf559ab78d2c2d02d11b4833c98a0040 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 9 Jul 2010 10:40:22 -0700
Subject: Reset the title in case the dialog contents changed the dialog title.

---
 lib/gallery.dialog.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 289345bc..1d0eae7e 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -37,15 +37,7 @@
          self._layout();
 
          $("#g-dialog").dialog("open");
-         // Remove titlebar for progress dialogs or set title
-         if ($("#g-dialog #g-progress").length) {
-           $(".ui-dialog-titlebar").remove();
-         } else if ($("#g-dialog h1").length) {
-           $("#g-dialog").dialog('option', 'title', $("#g-dialog h1:eq(0)").html());
-	   $("#g-dialog h1:eq(0)").hide();
-         } else if ($("#g-dialog fieldset legend").length) {
-           $("#g-dialog").dialog('option', 'title', $("#g-dialog fieldset legend:eq(0)").html());
-         }
+         self._set_title();
 
          if ($("#g-dialog form").length) {
            self._ajaxify_dialog();
@@ -122,6 +114,7 @@
              $("#g-dialog").dialog("option", "position", "center");
              $("#g-dialog form :submit").removeClass("ui-state-disabled")
                .attr("disabled", null);
+             self._set_title();
              self._ajaxify_dialog();
              self.form_loaded(null, $("#g-dialog form"));
              if (typeof data.reset == 'function') {
@@ -139,6 +132,18 @@
        });
      },
 
+     _set_title: function() {
+       // Remove titlebar for progress dialogs or set title
+       if ($("#g-dialog #g-progress").length) {
+         $(".ui-dialog-titlebar").remove();
+       } else if ($("#g-dialog h1").length) {
+         $("#g-dialog").dialog('option', 'title', $("#g-dialog h1:eq(0)").html());
+         $("#g-dialog h1:eq(0)").hide();
+       } else if ($("#g-dialog fieldset legend").length) {
+         $("#g-dialog").dialog('option', 'title', $("#g-dialog fieldset legend:eq(0)").html());
+       }
+     },
+
      form_closing: function(event, ui) {},
      dialog_closing: function(event, ui) {}
    });
-- 
cgit v1.2.3