@@ -782,7 +782,7 @@ exports.default = {
782
782
for ( var _iterator = ( 0 , _getIterator3 . default ) ( this . scrollactiveItems ) , _step ; ! ( _iteratorNormalCompletion = ( _step = _iterator . next ( ) ) . done ) ; _iteratorNormalCompletion = true ) {
783
783
var scrollactiveItem = _step . value ;
784
784
785
- var target = document . querySelector ( scrollactiveItem . hash ) ;
785
+ var target = document . getElementById ( scrollactiveItem . hash . substr ( 1 ) ) ;
786
786
787
787
if ( this . isWindowInsideTarget ( target ) ) {
788
788
scrollactiveItem . classList . add ( this . activeClass ) ;
@@ -816,7 +816,7 @@ exports.default = {
816
816
isWindowInsideTarget : function isWindowInsideTarget ( target ) {
817
817
var distanceFromTop = window . scrollY ;
818
818
var targetDistanceFromTop = target . offsetTop ;
819
- var targetHeight = target . scrollHeight ;
819
+ var targetHeight = target . offsetHeight ;
820
820
821
821
if ( targetDistanceFromTop - this . offset <= distanceFromTop && targetDistanceFromTop + targetHeight - this . offset > distanceFromTop ) {
822
822
return true ;
@@ -839,7 +839,7 @@ exports.default = {
839
839
for ( var _iterator2 = ( 0 , _getIterator3 . default ) ( scrollactiveItems ) , _step2 ; ! ( _iteratorNormalCompletion2 = ( _step2 = _iterator2 . next ( ) ) . done ) ; _iteratorNormalCompletion2 = true ) {
840
840
var scrollactiveItem = _step2 . value ;
841
841
842
- if ( ! document . querySelector ( scrollactiveItem . hash ) ) {
842
+ if ( ! document . getElementById ( scrollactiveItem . hash . substr ( 1 ) ) ) {
843
843
throw new Error ( "Element '" + scrollactiveItem . hash + "' was not found. Make sure it is set in the DOM." ) ;
844
844
}
845
845
}
@@ -896,7 +896,7 @@ exports.default = {
896
896
}
897
897
898
898
var vm = this ;
899
- var targetDistanceFromTop = document . querySelector ( event . target . hash ) . offsetTop ;
899
+ var targetDistanceFromTop = document . getElementById ( event . target . hash . substr ( 1 ) ) . offsetTop ;
900
900
var startingY = window . pageYOffset ;
901
901
var difference = targetDistanceFromTop - startingY ;
902
902
var start = null ;
@@ -919,7 +919,7 @@ exports.default = {
919
919
if ( progress < vm . duration ) {
920
920
window . AFRequestID = window . requestAnimationFrame ( step ) ;
921
921
} else {
922
- window . addEventListener ( 'scroll' , vm . init ) ;
922
+ window . addEventListener ( 'scroll' , vm . onScroll ) ;
923
923
}
924
924
}
925
925
@@ -958,6 +958,10 @@ exports.default = {
958
958
}
959
959
}
960
960
}
961
+ } ,
962
+ beforeDestroy : function beforeDestroy ( ) {
963
+ window . removeEventListener ( 'scroll' , this . onScroll ) ;
964
+ window . cancelAnimationFrame ( window . AFRequestID ) ;
961
965
}
962
966
} ;
963
967
0 commit comments