Merge pull request #14 from puttyman/master

Fixed Affix directive has a flickering bug in IE8-IE11. #13
mg · May 19, 2015 · 17626ae · 17626ae
2 parents b9b0546 + e7ce90d
commit 17626ae
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/dist/ngScrollSpy.debug.js b/dist/ngScrollSpy.debug.js
@@ -9,14 +9,24 @@ Licence: MIT
 
 mod.service('ScrollSpy', function($window) {
 	var rawData= function(w) {
+        // Fix for IE browsers
+        // See https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollY?redirectlocale=en-US&redirectslug=DOM%2Fwindow.scrollY for more info
+        var innerWidth = w.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+        var innerHeight = w.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+        var supportPageOffset = w.pageXOffset !== undefined;
+        var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat");
+
+        var scrollX = supportPageOffset ? w.pageXOffset : isCSS1Compat ? document.documentElement.scrollLeft : document.body.scrollLeft;
+        var scrollY= supportPageOffset ? w.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
+
 		// retrieve interesting data
 		var raw= {
 			width: w.innerWidth,
 			height: w.innerHeight,
 			maxWidth: w.document.body.scrollWidth,
 			maxHeight: w.document.body.scrollHeight,
-			posX: w.scrollX,
-			posY: w.scrollY
+			posX: w.scrollX || w.pageXOffset || w.document.documentElement.scrollLeft,
+			posY: w.scrollY || w.pageYOffset || w.document.documentElement.scrollTop
 		};
 
 		// remove but log overscroll

diff --git a/dist/ngScrollSpy.js b/dist/ngScrollSpy.js
@@ -9,14 +9,24 @@ Licence: MIT
 
 mod.service('ScrollSpy', function($window) {
 	var rawData= function(w) {
+        // Fix for IE browsers
+        // See https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollY?redirectlocale=en-US&redirectslug=DOM%2Fwindow.scrollY for more info
+        var innerWidth = w.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+        var innerHeight = w.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+        var supportPageOffset = w.pageXOffset !== undefined;
+        var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat");
+
+        var scrollX = supportPageOffset ? w.pageXOffset : isCSS1Compat ? document.documentElement.scrollLeft : document.body.scrollLeft;
+        var scrollY= supportPageOffset ? w.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
+
 		// retrieve interesting data
 		var raw= {
 			width: w.innerWidth,
 			height: w.innerHeight,
 			maxWidth: w.document.body.scrollWidth,
 			maxHeight: w.document.body.scrollHeight,
-			posX: w.scrollX,
-			posY: w.scrollY
+			posX: w.scrollX || w.pageXOffset || w.document.documentElement.scrollLeft,
+			posY: w.scrollY || w.pageYOffset || w.document.documentElement.scrollTop
 		};
 
 		// remove but log overscroll
@@ -379,7 +389,7 @@ mod.directive('pageitems', function(ScrollSpy) {
 				}
 
 				var pos = spyElem.getBoundingClientRect().top;
-				if (Math.floor(pos) <= topmargin) {
+				if (pos <= topmargin) {
 					// the window has been scrolled past the top of a spy element
 					spy.pos = pos;
 
@@ -559,4 +569,4 @@ mod.directive('pagemenuspy', function($location, $anchorScroll) {
 });
 
 	function getState() { return state; }
-})(angular);
+})(angular);
diff --git a/dist/ngScrollSpy.min.js b/dist/ngScrollSpy.min.js
diff --git a/src/scrollspy.js b/src/scrollspy.js
@@ -1,5 +1,15 @@
 mod.service('ScrollSpy', function($window) {
 	var rawData= function(w) {
+        // Fix for IE browsers
+        // See https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollY?redirectlocale=en-US&redirectslug=DOM%2Fwindow.scrollY for more info
+        var innerWidth = w.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+        var innerHeight = w.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+        var supportPageOffset = w.pageXOffset !== undefined;
+        var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat");
+
+        var scrollX = supportPageOffset ? w.pageXOffset : isCSS1Compat ? document.documentElement.scrollLeft : document.body.scrollLeft;
+        var scrollY= supportPageOffset ? w.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
+
 		// retrieve interesting data
 		var raw= {
 			width: w.innerWidth,