# HG changeset patch # User veltr # Date 1379607241 -7200 # Node ID ea73469b44c33040764d978b4672a7ed3942cbc8 # Parent 439485fd59619b7290f1f9e97725bfccaee0101f Fixed menu behaviour diff -r 439485fd5961 -r ea73469b44c3 src/jocondelab/static/jocondelab/css/front-common.css --- a/src/jocondelab/static/jocondelab/css/front-common.css Thu Sep 19 17:57:10 2013 +0200 +++ b/src/jocondelab/static/jocondelab/css/front-common.css Thu Sep 19 18:14:01 2013 +0200 @@ -122,7 +122,7 @@ } .menus-wrapper { - background: #ffffff; box-shadow: 0 2px 4px #666666; + background: #ffffff; box-shadow: 0 2px 4px #666666; position: absolute; left: 0; top: 70px; right: 0; z-index: 6; } header, .main, footer, .menu-list { diff -r 439485fd5961 -r ea73469b44c3 src/jocondelab/static/jocondelab/js/front-common.js --- a/src/jocondelab/static/jocondelab/js/front-common.js Thu Sep 19 17:57:10 2013 +0200 +++ b/src/jocondelab/static/jocondelab/js/front-common.js Thu Sep 19 18:14:01 2013 +0200 @@ -403,20 +403,28 @@ $overlayImg.load(recentreDbpediaBox); - $(".menu-link a").mouseover(function() { - var $menu = $($(this).attr("href")); - $menu.stop(true).slideDown(function(){ $menu.css("height",""); }); - }).mouseout(function() { - $(".menu-list").stop(true).delay(3000).slideUp(function(){ $(".menu-list").css("height",""); }); - }).click(function() { + var hideTo, $ml = $(".menu-list"); + + function hideMenus() { + clearTimeout(hideTo); + hideTo = setTimeout(function() { + $ml.stop(true).slideUp(); + }, 3000); + } + function showMenu(selector) { + clearTimeout(hideTo); + $(selector).stop(true).slideDown(); + } + $(".menu-link a").mouseenter(function() { + $ml.stop(true).slideUp(); + showMenu($(this).attr("href")); + }).mouseleave(hideMenus).click(function() { return false; }); - $(".menu-list").mouseover(function() { - $(this).stop(true).show().css("height",""); - }).mouseout(function() { - $(".menu-list").stop(true).delay(3000).slideUp(function(){ $(".menu-list").css("height",""); }); - }); + $ml.mouseover(function() { + showMenu(this); + }).mouseout(hideMenus); $("#language-menu a").click(function() { $(".language-input").val($(this).attr("data-language-code")); diff -r 439485fd5961 -r ea73469b44c3 src/jocondelab/static/jocondelab/js/front-timeline.js --- a/src/jocondelab/static/jocondelab/js/front-timeline.js Thu Sep 19 17:57:10 2013 +0200 +++ b/src/jocondelab/static/jocondelab/js/front-timeline.js Thu Sep 19 18:14:01 2013 +0200 @@ -5,7 +5,7 @@ zoomLevel = 8, zoomStep = Math.SQRT2, minZoomLevel = 1, - maxZoomLevel = 64, + maxZoomLevel = 256, sliderWidth = 3000, baseSpan = (endYear - startYear), $slider = $(".timeline-mill-slider"),