From c51b6ab38d7f16d64127fd3a73df38166a698f0f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 4 Sep 2010 15:54:07 -0700
Subject: Fix full size dimensions after rotating an image on the photo view
 page.

The photo view page caches the dimensions of the full size and then
renders it in Javascript.  But after rotation, those dimensions are no
longer valid.  Create a new function on the items controller that
returns the appropriate dimensions, then add a hook on
$.gallery_replace_image and implement the hook on the photo view page
to have it make an async call to get the new dimensions.

Fixes ticket #1317
---
 themes/wind/views/photo.html.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'themes/wind/views/photo.html.php')

diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index f8b5511c..cb830e23 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -4,10 +4,23 @@
 <!-- Use javascript to show the full size as an overlay on the current page -->
 <script type="text/javascript">
   $(document).ready(function() {
+    full_dims = [<?= $theme->item()->width ?>, <?= $theme->item()->height ?>];
     $(".g-fullsize-link").click(function() {
-      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, full_dims[0], full_dims[1]);
       return false;
     });
+
+    // After the image is rotated or replaced we have to reload the image dimensions
+    // so that the full size view isn't distorted.
+    gallery_image_replaced_hook = function(data, thumb) {
+      $.ajax({
+        url: "<?= url::site("items/dimensions/" . $theme->item()->id) ?>",
+        dataType: "json",
+        success: function(data, textStatus) {
+          full_dims = data.full;
+        }
+      });
+    }
   });
 </script>
 <? endif ?>
-- 
cgit v1.2.3


From 32878ebfdce943271824891639ab0384053bbadd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 9 Sep 2010 21:04:18 -0700
Subject: Replace the hook function hack I introduced in
 cbba45fffc7368280e9529f55e108d0080175b6a with a namespaced jQuery custom
 event.  This is way more portable.

---
 lib/gallery.common.js            | 8 +++-----
 themes/wind/views/photo.html.php | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'themes/wind/views/photo.html.php')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 69452f39..9fccc602 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -119,11 +119,9 @@
   };
 
   // Ajax handler for replacing an image, used in Ajax thumbnail rotation
-  $.gallery_replace_image = function(data, thumb) {
-    $(thumb).attr({src: data.src, width: data.width, height: data.height});
-    if (typeof gallery_image_replaced_hook == 'function') {
-      gallery_image_replaced_hook(data, thumb);
-    }
+  $.gallery_replace_image = function(data, img_selector) {
+    $(img_selector).attr({src: data.src, width: data.width, height: data.height});
+    $(img_selector).trigger("gallery.change");
   };
 
   // Initialize context menus
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index cb830e23..b42ab987 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -12,7 +12,7 @@
 
     // After the image is rotated or replaced we have to reload the image dimensions
     // so that the full size view isn't distorted.
-    gallery_image_replaced_hook = function(data, thumb) {
+    $("#g-photo").bind("gallery.change", function() {
       $.ajax({
         url: "<?= url::site("items/dimensions/" . $theme->item()->id) ?>",
         dataType: "json",
@@ -20,7 +20,7 @@
           full_dims = data.full;
         }
       });
-    }
+    });
   });
 </script>
 <? endif ?>
-- 
cgit v1.2.3