From: Nordanne Isahac <den.isahac@gmail.com>
Date: Thu, 19 Jan 2017 15:46:56 +0000 (+0800)
Subject: Improvements
X-Git-Tag: v6.4.0-rc1~102^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffdc71d8e882a7d5eb32e3b69c7487ce01895994;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Improvements
---

diff --git a/docs/pages/smooth-scroll.md b/docs/pages/smooth-scroll.md
index 59327576f..54faacc9b 100644
--- a/docs/pages/smooth-scroll.md
+++ b/docs/pages/smooth-scroll.md
@@ -6,16 +6,9 @@ tags:
   - navigation
 ---
 
-<ul class="menu vertical" data-smooth-scroll>
-  <li><a href="#setup">Setup</a></li>
-  <li><a href="#javascript-reference">Javascript Reference</a></li>
-</ul>
-
-<br>
-
-## Setup
+## Usage
 
-To enable SmoothScroll on internal links, just add the attribute `data-smooth-scroll` to the parent container like our [Menu](menu.html). Each section needs a unique ID
+To enable smooth scrolling on internal links add the attribute `data-smooth-scroll` to the parent container like our [Menu](menu.html). Each section needs a unique ID
 
 ```html
 <ul class="horizontal menu" data-smooth-scroll>
@@ -30,7 +23,7 @@ To enable SmoothScroll on internal links, just add the attribute `data-smooth-sc
 </div>
 ```
 
-You can also setup SmoothScroll directly via indiviual link.
+You can also apply `data-smooth-scroll` attribute directly to the link.
 
 ```html
 <a href="#exclusive" data-smooth-scroll>Exclusive Section</a>
diff --git a/js/foundation.smoothScroll.js b/js/foundation.smoothScroll.js
index f81a8a14c..b749516c3 100644
--- a/js/foundation.smoothScroll.js
+++ b/js/foundation.smoothScroll.js
@@ -62,17 +62,19 @@ class SmoothScroll {
     /**
      * Function to scroll to a given location on the page.
      * @param {String} loc - A properly formatted jQuery id selector. Example: '#foo'
-     * @param {Object} options - The options to use.
-     * @param {Function} callback - The callback function.
+     * @param {Object} options - Overrides to the default plugin settings.
+     * @param {Function} callback - The callback function when scroll animation is finished.
      * @static
      * @function
      */
-    static scrollToLoc(loc, options = SmoothScroll.defaults, callback) {
+    static scrollToLoc(loc, options, callback) {
         // Do nothing if target does not exist to prevent errors
         if (!$(loc).length) {
             return false;
         }
 
+        options = $.extend({}, SmoothScroll.defaults, options);
+
         var scrollPos = Math.round($(loc).offset().top - options.threshold / 2 - options.offset);
 
         $('html, body').stop(true).animate(