summaryrefslogtreecommitdiff
path: root/modules/organize
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-09-17 20:23:05 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-09-17 20:23:05 +0000
commit7a5de04e51daa102840a02af6b9ce8138d08c4bb (patch)
treea3f8bcb9ac961523b4835b8865c152c8835f25e7 /modules/organize
parentf96a75f2b13a0bd7a37b320aa5655f67868ca80d (diff)
parent3e1743b21fd35b9d6d540e827292f1f4f006b531 (diff)
Pulled latest source from upstream.
Diffstat (limited to 'modules/organize')
-rw-r--r--modules/organize/lib/Gallery3WebClient.swfbin148799 -> 148926 bytes
-rw-r--r--modules/organize/views/organize_dialog.html.php10
2 files changed, 9 insertions, 1 deletions
diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index b82c8a42..356a1a2f 100644
--- a/modules/organize/lib/Gallery3WebClient.swf
+++ b/modules/organize/lib/Gallery3WebClient.swf
Binary files differ
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b76813ad..3ea1143d 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -19,13 +19,21 @@
<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();
+ if ($(this).data("reload.location")) {
+ window.location = $(this).data("reload.location");
+ } else {
+ window.location.reload();
+ }
});
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);
}