diff --git a/ui/experiment-ribbon-navigation-mechanics-n-structure.html b/ui/experiment-ribbon-navigation-mechanics-n-structure.html index 13c61bce..b6f550ef 100755 --- a/ui/experiment-ribbon-navigation-mechanics-n-structure.html +++ b/ui/experiment-ribbon-navigation-mechanics-n-structure.html @@ -106,23 +106,12 @@ function alignRibbon(square, position, zoom){ } // XXX need to fix animation jumping around... -function zoomIn(){ - var zoom = $('.container').css('zoom')*2 +function zoom(factor){ + var zoom = $('.container').css('zoom')*factor var H = $('.meta-container').height() var W = $('.meta-container').width() - $('.container').animate({ - 'zoom': zoom, - 'top': H/2 * 1/zoom - H/2, - 'left': W/2 * 1/zoom - W/2, - }) -} -function zoomOut(){ - var zoom = $('.container').css('zoom')*0.5 - var H = $('.meta-container').height() - var W = $('.meta-container').width() - - $('.container').animate({ + $('.container').css({ 'zoom': zoom, 'top': H/2 * 1/zoom - H/2, 'left': W/2 * 1/zoom - W/2, @@ -210,8 +199,8 @@ function zoomOut(){ - - + +

@@ -296,9 +285,5 @@ function zoomOut(){
- - - -