summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStella Power2007-10-08 13:24:57 (GMT)
committer Stella Power2007-10-08 13:24:57 (GMT)
commit366c7c591faf87aa2e7ad7d5c708269bc5baf486 (patch)
tree2fec77bf9b0cd903e8d0ce2666576f13764e9967
parent0968d39d50ff0705655e2f468cc8106dcc64ceae (diff)
fixes for safari browser
-rw-r--r--css/lightbox.css2
-rw-r--r--js/lightbox.js11
2 files changed, 10 insertions, 3 deletions
diff --git a/css/lightbox.css b/css/lightbox.css
index 756fd95..b05199b 100644
--- a/css/lightbox.css
+++ b/css/lightbox.css
@@ -151,7 +151,7 @@
height: 32px;
}
#bottomNavZoom {
- display: block;
+ display: none;
background: url(../images/expand.gif) no-repeat;
width: 34px;
height: 34px;
diff --git a/js/lightbox.js b/js/lightbox.js
index b3b104b..4d81d23 100644
--- a/js/lightbox.js
+++ b/js/lightbox.js
@@ -71,7 +71,7 @@ var Lightbox = {
// MAKE THE LIGHTBOX DIVS
// Code inserts html at the bottom of the page that looks similar to this:
- // (default layout)
+ // (default layout)
//
// <div id="overlay"></div>
// <div id="lightbox">
@@ -342,6 +342,7 @@ var Lightbox = {
$('#nextLink').hide();
$('#imageDataContainer').hide();
$('#numberDisplay').hide();
+ $('#bottomNavZoom').hide();
imgPreloader = new Image();
@@ -380,6 +381,7 @@ var Lightbox = {
photo.style.width = (new_width) + 'px';
Lightbox.resizeImageContainer(new_width, new_height);
+
// clear onLoad, IE behaves irratically with animated gifs otherwise
imgPreloader.onload = function() {};
}
@@ -438,7 +440,12 @@ var Lightbox = {
// Display image and begin preloading neighbors.
showImage: function() {
$('#loading').hide();
- $('#lightboxImage').fadeIn(Lightbox.fadeInSpeed);
+ if($.browser.safari) {
+ $('#lightboxImage').show();
+ }
+ else {
+ $('#lightboxImage').fadeIn(Lightbox.fadeInSpeed);
+ }
Lightbox.updateDetails();
this.preloadNeighborImages();
this.inprogress = false;