From: jk Date: Thu, 12 May 2016 15:11:09 +0000 (+0200) Subject: Merge remote-tracking branch 'remotes/origin/v6.3' into v6.3-drilldown-autoheight X-Git-Tag: v6.3-rc1~62^2~1^2 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8699%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Merge remote-tracking branch 'remotes/origin/v6.3' into v6.3-drilldown-autoheight # Conflicts: # docs/pages/drilldown-menu.md # js/foundation.drilldown.js --- 563939d7342e3e9f0e0bbf3118b0d517f9de6dc5 diff --cc docs/pages/drilldown-menu.md index b8d926094,fbfcaae1c..55daea9b9 --- a/docs/pages/drilldown-menu.md +++ b/docs/pages/drilldown-menu.md @@@ -73,76 -73,62 +73,132 @@@ Any `` without a submenu will functi
  • Item 4
    • +## autoHeight + +
    +

    If you like to set the height to auto you can also set the autoHeight and animateHeight params

    + +
    + + + + ## ScrollTop Drilldown + +
    Scroll to the top of the menu when selecting a submenu/navigating back using the menu back button. Can be useful with a longer menu to provide a better user experience.
    + + + --- ## Custom Styling diff --cc js/foundation.drilldown.js index e711d582a,aade7664e..cf2cec93b --- a/js/foundation.drilldown.js +++ b/js/foundation.drilldown.js @@@ -368,18 -392,36 +400,48 @@@ Drilldown.defaults = * @example false */ closeOnClick: false, + /** + * Allow the menu to auto adjust height. + * @option + * @example false + */ + autoHeight: false, + /** + * Animate the auto adjust height. + * @option + * @example false + */ - animateHeight: false ++ animateHeight: false, + /** + * Scroll to the top of the menu after opening a submenu or navigating back using the menu back button + * @option + * @example false + */ + scrollTop: false, + /** + * String jquery selector (for example 'body') of element to take offset().top from, if empty string the drilldown menu offset().top is taken + * @option + * @example '' + */ + scrollTopElement: '', + /** + * ScrollTop offset + * @option + * @example 100 + */ + scrollTopOffset: 0, + /** + * Scroll animation duration + * @option + * @example 500 + */ + animationDuration: 500, + /** + * Scroll animation easing + * @option + * @example 'swing' + */ + animationEasing: 'swing' // holdOpen: false };