[Jifty-commit] jifty branch, master, updated. 295c8a14c50246c3ca685b5f648acaf6789fdd7f

[Jifty commits]

The branch, master has been updated
       via  295c8a14c50246c3ca685b5f648acaf6789fdd7f (commit)
       via  641061a5b4b43055ecf158cb1d6e46d8a5765276 (commit)
      from  34a86018fc6af3edb299f60aec731c02096f18f7 (commit)

Summary of changes:
 lib/Jifty/Web/Menu.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 641061a5b4b43055ecf158cb1d6e46d8a5765276
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Jan 11 12:13:03 2010 -0500

    Ignore show/hide events from submenus

diff --git a/lib/Jifty/Web/Menu.pm b/lib/Jifty/Web/Menu.pm
index 717fa8d..e979e3b 100644
--- a/lib/Jifty/Web/Menu.pm
+++ b/lib/Jifty/Web/Menu.pm
@@ -473,8 +473,8 @@ sub render_as_yui_menu {
                         },
                         null, menu
                     );
-                    menu.subscribe("show", function() { jQuery("#$args{button}").addClass("open") });
-                    menu.subscribe("hide", function() { jQuery("#$args{button}").removeClass("open") });
+                    menu.subscribe("show", function() { if (!this.parent) jQuery("#$args{button}").addClass("open") });
+                    menu.subscribe("hide", function() { if (!this.parent) jQuery("#$args{button}").removeClass("open") });
                 }
             });
         </script>

commit 295c8a14c50246c3ca685b5f648acaf6789fdd7f
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Jan 11 12:13:46 2010 -0500

    Scroll to show submenus too

diff --git a/lib/Jifty/Web/Menu.pm b/lib/Jifty/Web/Menu.pm
index e979e3b..946ee5b 100644
--- a/lib/Jifty/Web/Menu.pm
+++ b/lib/Jifty/Web/Menu.pm
@@ -462,7 +462,7 @@ sub render_as_yui_menu {
                 menu.render();
                 menu.subscribe("show", function() {
                     if ( !this.cfg.getProperty("constraintoviewport") )
-                        Jifty.Utils.scrollToShow("$args{id}");
+                        Jifty.Utils.scrollToShow(this.id);
                 });
                 $showjs
 

-----------------------------------------------------------------------