From b6fa33faf789749f4de3f4eadf8832748372c980 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 7 Sep 2010 18:53:17 -0700
Subject: Create a setLocation javascript callback which is called everytime
 with the full url of the current album(non-REST). When the dialog is closed
 the window location is set to this value and the page gets loaded
 appropriately.

---
 modules/organize/lib/Gallery3WebClient.swf      | Bin 148799 -> 148920 bytes
 modules/organize/views/organize_dialog.html.php |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules/organize')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index b82c8a42..71daa2f9 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b76813ad..769d6e9a 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -19,13 +19,17 @@
 <script type="text/javascript">
   $("#g-dialog").bind("dialogclose", function(event, ui) {
     // @todo do a call to organize/closing to end the batch
-    window.location.reload();
+    window.location = $(this).data("reload.location");
   });
 
   function closeOrganizeDialog() {
     $("#g-dialog").dialog("close");
   }
 
+  function setLocation(url) {
+    $("#g-dialog").data("reload.location", url);
+  }
+
   function setTitle(title) {
     $("#ui-dialog-title-g-dialog").text(<?= t("Organize :: ")->for_js() ?> + title);
   }
-- 
cgit v1.2.3


From 91d4ffa68068dd194f3b789ab6cbc8f1aabe7627 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 9 Sep 2010 20:36:18 -0700
Subject: Change the color of the text in the close button to match the
 foreground color not the border color.

---
 modules/organize/lib/Gallery3WebClient.swf | Bin 148920 -> 148926 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index 71daa2f9..356a1a2f 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From cc4a54a3d65d5a6772cbf2d9670a0af0d6d52542 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 22:18:53 -0700
Subject: Fix bug introduced in b6fa33faf789749f4de3f4eadf8832748372c980. 
 Don't try to use $(this).data("reload.location") if it hasn't been set, which
 can happen if Flash isn't available.  Fixes #1362

---
 modules/organize/views/organize_dialog.html.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules/organize')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 769d6e9a..3ea1143d 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -19,7 +19,11 @@
 <script type="text/javascript">
   $("#g-dialog").bind("dialogclose", function(event, ui) {
     // @todo do a call to organize/closing to end the batch
-    window.location = $(this).data("reload.location");
+    if ($(this).data("reload.location")) {
+      window.location = $(this).data("reload.location");
+    } else {
+      window.location.reload();
+    }
   });
 
   function closeOrganizeDialog() {
-- 
cgit v1.2.3