From: Jordan Humphreys <jordan@mailyard.net>
Date: Wed, 10 Apr 2013 16:47:46 +0000 (-0700)
Subject: Remove deprecated settings object.
X-Git-Tag: v4.1.2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f7978ab5e4ee4ac34674a31df8df1889c53d347;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Remove deprecated settings object.
---

diff --git a/js/foundation/foundation.reveal.js b/js/foundation/foundation.reveal.js
index 958d6d709..20d320929 100644
--- a/js/foundation/foundation.reveal.js
+++ b/js/foundation/foundation.reveal.js
@@ -42,7 +42,7 @@
       if (typeof method === 'object') {
         $.extend(true, this.settings, method);
       } else if (typeof options !== 'undefined') {
-        $.extend(true, this.settings, this.defaults, options);
+        $.extend(true, this.settings, options);
       }
 
       if (typeof method != 'string') {