Skip to content

Commit

Permalink
adding fixes for webkit browsers
Browse files Browse the repository at this point in the history
  • Loading branch information
addyosmani committed Oct 9, 2010
1 parent 4a5a865 commit dce29dc
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 8 deletions.
3 changes: 2 additions & 1 deletion demos/demo1/index.html
Expand Up @@ -42,6 +42,7 @@







</style> </style>


<!--Include jQuery and jQuery roundrr dependancies--> <!--Include jQuery and jQuery roundrr dependancies-->
Expand Down Expand Up @@ -70,7 +71,7 @@
<a href="#" id="prev"></a> <a href="#" id="prev"></a>
<img class="keyboard" src="../../images/keyboard.png"></img> <img class="keyboard" src="../../images/keyboard.png"></img>
<p> <p>
You can also navigate using the left and right keys on your keyboard. You can also navigate using the left and right keys on your keyboard. Space zooms the image using a lightbox and Esc closes.
<br><br> <br><br>
Note in this demo that we are in 'standard' mode as opposed to 'pick' mode. Note in this demo that we are in 'standard' mode as opposed to 'pick' mode.
</p> </p>
Expand Down
46 changes: 39 additions & 7 deletions demos/demo1/js/app.js
Expand Up @@ -3,7 +3,10 @@ jQuery(document).ready(function()


var currentImage = ""; var currentImage = "";
var interfaceLock = false; var interfaceLock = false;

var imageCaption = "";
var imageSrc = "";
var largerImage = "";
var speechBubble = "";




jQuery("#roundrr_container").roundrrwheel( jQuery("#roundrr_container").roundrrwheel(
Expand Down Expand Up @@ -91,15 +94,19 @@ jQuery(document).ready(function()
$('#next').bind('click', spinMenuRight); $('#next').bind('click', spinMenuRight);
$('#prev').bind('click', spinMenuLeft); $('#prev').bind('click', spinMenuLeft);





function showLargeImage($i, mode) function showLargeImage($i, mode)
{ {


interfaceLock = true; interfaceLock = true;
var thisImage = $i.find('img'); var thisImage = $i.find('img');
var imageSrc = thisImage.attr('src');
var largerImage = imageSrc.replace('_bigger', ''); imageSrc = thisImage.attr('src');
var imageCaption = thisImage.attr('alt'); largerImage = imageSrc.replace('_bigger', '');
var speechBubble = jQuery('.roundrr_speech'); imageCaption = thisImage.attr('alt');
speechBubble = jQuery('.roundrr_speech');




var captionObject = jQuery('#roundrr_caption'); var captionObject = jQuery('#roundrr_caption');
Expand All @@ -113,14 +120,25 @@ jQuery(document).ready(function()
captionObject.html(imageCaption); captionObject.html(imageCaption);




/*utilize the slimbox API for lightbox triggering*/ /*center area: utilize the slimbox API for lightbox triggering*/
centerObject.bind('click', function() centerObject.bind('click', function()
{ {


jQuery.slimbox(largerImage, imageCaption, { overlayOpacity:0.6}); showLightbox();


}); });



/*hover case for central image*/
centeredImage.hover( function()
{
$(this).css('opacity','0.5');

}, function()
{
$(this).css('opacity','1');
});



if(mode=='noanim') if(mode=='noanim')
{ {
Expand All @@ -136,6 +154,12 @@ jQuery(document).ready(function()
} }




/*Show lightbox for current image*/
function showLightbox()
{
jQuery.slimbox(largerImage, imageCaption, { overlayOpacity:0});
}

/*Spin the menu to the left*/ /*Spin the menu to the left*/
function spinMenuLeft() function spinMenuLeft()
{ {
Expand All @@ -158,6 +182,7 @@ jQuery(document).ready(function()
$(window).keydown(function(event) $(window).keydown(function(event)
{ {
var keycode = event.keyCode; var keycode = event.keyCode;

switch(keycode) switch(keycode)
{ {
case 39: case 39:
Expand All @@ -166,6 +191,13 @@ jQuery(document).ready(function()
case 37: case 37:
spinMenuRight(); spinMenuRight();
break; break;
case 32:
if(largerImage.length)
{
showLightbox();
}
break;

} }); } });




Expand Down
5 changes: 5 additions & 0 deletions demos/demo1/lightbox/css/slimbox2.css
Expand Up @@ -19,8 +19,13 @@
background-color: #fff; background-color: #fff;
margin-top:-200px; margin-top:-200px;
margin-left:-50px; margin-left:-50px;

-webkit-margin-top:-560px;
-webkit-margin-left:-300px;
} }




.lbLoading { .lbLoading {
background: #fff url(loading.gif) no-repeat center; background: #fff url(loading.gif) no-repeat center;
} }
Expand Down

0 comments on commit dce29dc

Please sign in to comment.