From 214d977f4dc9ac78f4571a7cc89109fd95f5a2eb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Jul 2009 06:51:21 -0700
Subject: Don't close the dialog window after we successfully complete an
 action.  The expectation is that we're going to reload the page (or redirect
 to a new url).  If we close the dialog, then we can trigger the onhover for
 items we've just deleted causing errors.

Simplify the API while we're at it by getting rid of the no-longer-used
on_success argument to openDialog()

This fixes #528.
---
 lib/gallery.dialog.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib/gallery.dialog.js')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index fc66323e..74c2f20e 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -11,23 +11,20 @@ function handleDialogEvent(event) {
   event.preventDefault();
 }
 
-function ajaxify_dialog(on_success) {
+function ajaxify_dialog() {
   $("#gDialog form").ajaxForm({
     dataType: "json",
     success: function(data) {
       if (data.form) {
         $("#gDialog form").replaceWith(data.form);
-        ajaxify_dialog(on_success);
+        ajaxify_dialog();
         on_form_loaded();
         if (typeof data.reset == 'function') {
           eval(data.reset + '()');
         }
       }
       if (data.result == "success") {
-        $("#gDialog").dialog("close");
-        if (on_success) {
-          on_success();
-        } else if (data.location) {
+	if (data.location) {
           window.location = data.location;
         } else {
           window.location.reload();
@@ -46,7 +43,7 @@ function ajaxify_dialog(on_success) {
  * @see handleDialogEvent()
  * @see showLoading()
  */
-function openDialog(element, on_success) {
+function openDialog(element) {
   var sHref = $(element).attr("href");
   var sTitle = $(element).attr("title");
   var eDialog = '<div id="gDialog"></div>';
@@ -92,7 +89,7 @@ function openDialog(element, on_success) {
       $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html());
     }
 
-    ajaxify_dialog(on_success);
+    ajaxify_dialog();
   });
   return false;
 }
-- 
cgit v1.2.3