Add check for document.scrollingElement

kswedberg · kswedberg · commit 6478c4367926 · 2015-09-08T12:18:21.000-04:00
* See https://dev.opera.com/articles/fixing-the-scrolltop-bug/
diff --git a/jquery.smooth-scroll.js b/jquery.smooth-scroll.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery Smooth Scroll - v1.5.5 - 2015-02-19
+ * jQuery Smooth Scroll - v1.5.6 - 2015-09-08
  * https://github.com/kswedberg/jquery-smooth-scroll
  * Copyright (c) 2015 Karl Swedberg
  * Licensed MIT (https://github.com/kswedberg/jquery-smooth-scroll/blob/master/LICENSE-MIT)
@@ -18,7 +18,7 @@
   }
 }(function ($) {
 
-  var version = '1.5.5',
+  var version = '1.5.6',
       optionOverrides = {},
       defaults = {
         exclude: [],
@@ -58,9 +58,18 @@
             dir = opts.dir && opts.dir === 'left' ? 'scrollLeft' : 'scrollTop';
 
         this.each(function() {
-
-          if (this === document || this === window) { return; }
           var el = $(this);
+
+          if (this === document || this === window) {
+            return;
+          }
+
+          if ( document.scrollingElement && (this === document.documentElement || this === document.body) ) {
+            scrollable.push(document.scrollingElement);
+
+            return false;
+          }
+
           if ( el[dir]() > 0 ) {
             scrollable.push(this);
           } else {
diff --git a/jquery.smooth-scroll.min.js b/jquery.smooth-scroll.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery-smooth-scroll",
   "title": "jQuery Smooth Scroll",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "scripts": {},
   "main": "jquery.smooth-scroll.js",
   "author": {
diff --git a/src/jquery.smooth-scroll.js b/src/jquery.smooth-scroll.js
@@ -1,5 +1,5 @@
 (function($) {
-  var version = '1.5.5',
+  var version = '1.5.6',
       optionOverrides = {},
       defaults = {
         exclude: [],
@@ -39,9 +39,18 @@
             dir = opts.dir && opts.dir === 'left' ? 'scrollLeft' : 'scrollTop';
 
         this.each(function() {
-
-          if (this === document || this === window) { return; }
           var el = $(this);
+
+          if (this === document || this === window) {
+            return;
+          }
+
+          if ( document.scrollingElement && (this === document.documentElement || this === document.body) ) {
+            scrollable.push(document.scrollingElement);
+
+            return false;
+          }
+
           if ( el[dir]() > 0 ) {
             scrollable.push(this);
           } else {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jquery-smooth-scroll",`
`3`	`3`	`"title": "jQuery Smooth Scroll",`
`4`		`- "version": "1.5.5",`
	`4`	`+ "version": "1.5.6",`
`5`	`5`	`"scripts": {},`
`6`	`6`	`"main": "jquery.smooth-scroll.js",`
`7`	`7`	`"author": {`