|
1 | | - |
2 | 1 | /*******************************************************************************/ |
3 | 2 | /* Subscriptions */ |
4 | 3 | /*******************************************************************************/ |
@@ -41,30 +40,26 @@ App.subscribe("init", function(){ |
41 | 40 | // |
42 | 41 | // Project Select Show/Hide |
43 | 42 | // |
44 | | - $(".toggle-projects").bind("click", function(e){ |
| 43 | + $(".toggle-projects").bind( "click", function( e ) { |
45 | 44 | e.preventDefault(); |
46 | | - var el = $(this); |
47 | | - if(el.hasClass('active')){ |
48 | | - el.removeClass('active'); |
49 | | - $("body").css({"marginTop":"0"}); |
50 | | - el.removeClass('down'); |
51 | | - } else { |
52 | | - el.addClass('active'); |
53 | | - $("body").css({"marginTop":"150px"}); |
54 | | - el.addClass('down'); |
55 | | - } |
| 45 | + |
| 46 | + var el = $( this ).toggleClass("active"); |
| 47 | + |
| 48 | + $("body").animate({ "marginTop": ( el.hasClass("active") ? "150px" : "0" ) }, 300, function() { |
| 49 | + el.toggleClass("down"); |
| 50 | + }); |
56 | 51 | }); |
57 | | - |
58 | | - // |
| 52 | + |
59 | 53 | // Project Select Clickoutside |
60 | | - // |
61 | | - $(".project-select").bind("clickoutside", function(e, el){ |
62 | | - var target = $(".toggle-projects"); |
63 | | - if($(el).parent(".toggle-projects").length != 1){ |
64 | | - if(target.hasClass('down')){ |
65 | | - target.removeClass("active down"); |
66 | | - $("body").css({"marginTop":"0"}, 300); |
67 | | - } |
| 54 | + $(".project-select").bind( "clickoutside", function( e ) { |
| 55 | + var el = $(".toggle-projects"); |
| 56 | + |
| 57 | + if ( e.target.parentNode === el[0] || e.target === el[0] ) { |
| 58 | + return; |
| 59 | + } |
| 60 | + |
| 61 | + if ( el.hasClass("down") ) { |
| 62 | + el.click(); |
68 | 63 | } |
69 | 64 | }); |
70 | 65 |
|
|
0 commit comments