From ecc7d881e3bad1dd8edf5cbd4382bda9a668fcb8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Jul 2009 05:52:50 -0700
Subject: Fix bug introduced in e0e450d90fe67ac199d82d2b8e902cff5c8b6c7d where
 it got rid of the 'img' var which is used when we set the click action on
 buttons.

Partial fix for #528.
---
 modules/gallery/js/quick.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/gallery/js/quick.js')

diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index 32e34ef3..28ced3f6 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -11,6 +11,7 @@ $(document).ready(function() {
 var show_quick = function() {
   var cont = $(this);
   var quick = $(this).find(".gQuick");
+  var img = cont.find(".gThumbnail,.gResize");
   $("#gQuickPane").remove();
   cont.append("<div id=\"gQuickPane\"></div>");
   $("#gQuickPane").hide();
-- 
cgit v1.2.3


From 6b013060aabc1d13545958fdb3c096faac2ba5a7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Jul 2009 06:15:44 -0700
Subject: Fix style: space after ) before {.

---
 modules/gallery/js/quick.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/js/quick.js')

diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index 28ced3f6..2dcb1c36 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -22,10 +22,10 @@ var show_quick = function() {
     function(data, textStatus) {
       $("#gQuickPane").html(data).slideDown("fast");
       $(".ui-state-default").hover(
-        function(){
+        function() {
           $(this).addClass("ui-state-hover");
         },
-        function(){
+        function() {
           $(this).removeClass("ui-state-hover");
         }
       );
-- 
cgit v1.2.3


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 +++++--------
 modules/gallery/js/quick.js |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'modules/gallery/js/quick.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;
 }
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index 2dcb1c36..3ac97f8e 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -46,7 +46,7 @@ var quick_do = function(cont, pane, img) {
     return false;
   }
   if (pane.hasClass("gDialogLink")) {
-    openDialog(pane, function() { window.location.reload(); });
+    openDialog(pane);
   } else {
     img.css("opacity", "0.1");
     cont.addClass("gLoadingLarge");
-- 
cgit v1.2.3