Skip to content

Commit 26babbb

Browse files
committed
Function name fixed
1 parent 8c4897c commit 26babbb

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

dist/vue-scrollactive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ exports.default = {
805805
if (progress < vm.duration) {
806806
window.AFRequestID = window.requestAnimationFrame(step);
807807
} else {
808-
window.addEventListener('scroll', vm.init);
808+
window.addEventListener('scroll', vm.onScroll);
809809
}
810810
}
811811

dist/vue-scrollactive.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/assets/main.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ exports.default = {
782782
for (var _iterator = (0, _getIterator3.default)(this.scrollactiveItems), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
783783
var scrollactiveItem = _step.value;
784784

785-
var target = document.querySelector(scrollactiveItem.hash);
785+
var target = document.getElementById(scrollactiveItem.hash.substr(1));
786786

787787
if (this.isWindowInsideTarget(target)) {
788788
scrollactiveItem.classList.add(this.activeClass);
@@ -816,7 +816,7 @@ exports.default = {
816816
isWindowInsideTarget: function isWindowInsideTarget(target) {
817817
var distanceFromTop = window.scrollY;
818818
var targetDistanceFromTop = target.offsetTop;
819-
var targetHeight = target.scrollHeight;
819+
var targetHeight = target.offsetHeight;
820820

821821
if (targetDistanceFromTop - this.offset <= distanceFromTop && targetDistanceFromTop + targetHeight - this.offset > distanceFromTop) {
822822
return true;
@@ -839,7 +839,7 @@ exports.default = {
839839
for (var _iterator2 = (0, _getIterator3.default)(scrollactiveItems), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
840840
var scrollactiveItem = _step2.value;
841841

842-
if (!document.querySelector(scrollactiveItem.hash)) {
842+
if (!document.getElementById(scrollactiveItem.hash.substr(1))) {
843843
throw new Error("Element '" + scrollactiveItem.hash + "' was not found. Make sure it is set in the DOM.");
844844
}
845845
}
@@ -896,7 +896,7 @@ exports.default = {
896896
}
897897

898898
var vm = this;
899-
var targetDistanceFromTop = document.querySelector(event.target.hash).offsetTop;
899+
var targetDistanceFromTop = document.getElementById(event.target.hash.substr(1)).offsetTop;
900900
var startingY = window.pageYOffset;
901901
var difference = targetDistanceFromTop - startingY;
902902
var start = null;
@@ -919,7 +919,7 @@ exports.default = {
919919
if (progress < vm.duration) {
920920
window.AFRequestID = window.requestAnimationFrame(step);
921921
} else {
922-
window.addEventListener('scroll', vm.init);
922+
window.addEventListener('scroll', vm.onScroll);
923923
}
924924
}
925925

@@ -958,6 +958,10 @@ exports.default = {
958958
}
959959
}
960960
}
961+
},
962+
beforeDestroy: function beforeDestroy() {
963+
window.removeEventListener('scroll', this.onScroll);
964+
window.cancelAnimationFrame(window.AFRequestID);
961965
}
962966
};
963967

src/scrollactive.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
if (progress < vm.duration) {
188188
window.AFRequestID = window.requestAnimationFrame(step);
189189
} else {
190-
window.addEventListener('scroll', vm.init);
190+
window.addEventListener('scroll', vm.onScroll);
191191
}
192192
}
193193

0 commit comments

Comments
 (0)