From: Kevin Ball <kmball11@gmail.com>
Date: Fri, 14 Oct 2016 22:05:50 +0000 (-0700)
Subject: Revert "Get rid of JS scroll behavior on reveal taking advantage of change in scss"
X-Git-Tag: v6.2.4-rc2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=787120adb2c84af6d9da5fa1814f1cc5e499aca3;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Revert "Get rid of JS scroll behavior on reveal taking advantage of change in scss"

This reverts commit 58854d66fa443ad398f3265d947c46c77bc67333.
---

diff --git a/js/foundation.reveal.js b/js/foundation.reveal.js
index 3ee35c5ef..211f1667c 100644
--- a/js/foundation.reveal.js
+++ b/js/foundation.reveal.js
@@ -157,10 +157,10 @@ class Reveal {
 
     if (this.options.closeOnClick && this.options.overlay) {
       this.$overlay.off('.zf.reveal').on('click.zf.reveal', function(e) {
-        if (e.target === _this.$element[0] ||
-          $.contains(_this.$element[0], e.target) ||
-            !$.contains(document, e.target)) {
-              return;
+        if (e.target === _this.$element[0] || 
+          $.contains(_this.$element[0], e.target) || 
+            !$.contains(document, e.target)) { 
+              return; 
         }
         _this.close();
       });
@@ -274,7 +274,7 @@ class Reveal {
     this.$element.trigger('open.zf.reveal');
 
     if (this.isMobile) {
-      //this.originalScrollPos = window.pageYOffset;
+      this.originalScrollPos = window.pageYOffset;
       $('html, body').addClass('is-reveal-open');
     }
     else {
@@ -296,8 +296,8 @@ class Reveal {
 
     if (!this.options.overlay && this.options.closeOnClick && !this.options.fullScreen) {
       $('body').on('click.zf.reveal', function(e) {
-        if (e.target === _this.$element[0] ||
-          $.contains(_this.$element[0], e.target) ||
+        if (e.target === _this.$element[0] || 
+          $.contains(_this.$element[0], e.target) || 
             !$.contains(document, e.target)) { return; }
         _this.close();
       });
@@ -413,10 +413,10 @@ class Reveal {
     function finishUp() {
       if (_this.isMobile) {
         $('html, body').removeClass('is-reveal-open');
-        //if(_this.originalScrollPos) {
-        //  $('body').scrollTop(_this.originalScrollPos);
-        //  _this.originalScrollPos = null;
-        //}
+        if(_this.originalScrollPos) {
+          $('body').scrollTop(_this.originalScrollPos);
+          _this.originalScrollPos = null;
+        }
       }
       else {
         $('body').removeClass('is-reveal-open');