@glitchr/stickyjs 1.0.28 → 1.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/css/index.css +1 -0
- package/src/js/sticky.js +9 -9
package/package.json
CHANGED
package/src/css/index.css
CHANGED
|
@@ -87,6 +87,7 @@ html { scroll-behavior: unset !important; }
|
|
|
87
87
|
height: 100%;
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
+
.sticky-swipehint { overflow: scroll; }
|
|
90
91
|
.sticky-swipehint.sticky-swipehint-reveal .sticky-swipehint-container > span { opacity:1; }
|
|
91
92
|
.sticky-swipehint .sticky-swipehint-container > span img { max-width: 100%; }
|
|
92
93
|
.sticky-swipehint .sticky-swipehint-container > span
|
package/src/js/sticky.js
CHANGED
|
@@ -954,14 +954,14 @@ $.fn.serializeObject = function () {
|
|
|
954
954
|
if((e.scrollX.direction !== undefined && e.scrollX.delta) || scrollPercent == 100) {
|
|
955
955
|
|
|
956
956
|
if(!(className in trigger[e.target[0]])) trigger[e.target[0]][className] = true;
|
|
957
|
-
if(scrollTrigger == "from" && e.scrollX.percent >= scrollPercent)
|
|
957
|
+
if(scrollTrigger == "from" && scrollDir == e.scrollX.direction && e.scrollX.percent >= scrollPercent)
|
|
958
958
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:0, dir:scrollDir, percent:scrollPercent}}));
|
|
959
|
-
if(scrollTrigger == "once" && e.scrollX.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
959
|
+
if(scrollTrigger == "once" && scrollDir == e.scrollX.direction && e.scrollX.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
960
960
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:1, dir:scrollDir, percent:scrollPercent}}));
|
|
961
961
|
|
|
962
|
-
if(scrollTrigger == "every" && e.scrollX.percent < scrollPercent )
|
|
962
|
+
if(scrollTrigger == "every" && scrollDir == e.scrollX.direction && e.scrollX.percent < scrollPercent )
|
|
963
963
|
trigger[e.target[0]][className] = true;
|
|
964
|
-
if(scrollTrigger == "every" && e.scrollX.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
964
|
+
if(scrollTrigger == "every" && scrollDir == e.scrollX.direction && e.scrollX.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
965
965
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:2, dir:scrollDir, percent:scrollPercent}}));
|
|
966
966
|
|
|
967
967
|
trigger[e.target[0]][className] = (scrollTrigger == "every" && e.scrollX.percent < scrollPercent);
|
|
@@ -970,11 +970,11 @@ $.fn.serializeObject = function () {
|
|
|
970
970
|
if((e.scrollY.direction !== undefined && e.scrollY.delta) || scrollPercent == 100) {
|
|
971
971
|
|
|
972
972
|
if(!className in trigger[e.target[0]]) trigger[e.target[0]][className] = true;
|
|
973
|
-
if(scrollTrigger == "from" && e.scrollY.percent >= scrollPercent)
|
|
973
|
+
if(scrollTrigger == "from" && scrollDir == e.scrollY.direction && e.scrollY.percent >= scrollPercent)
|
|
974
974
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:0, dir:scrollDir, percent:scrollPercent}}));
|
|
975
|
-
if(scrollTrigger == "once" && e.scrollY.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
975
|
+
if(scrollTrigger == "once" && scrollDir == e.scrollY.direction && e.scrollY.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
976
976
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:1, dir:scrollDir, percent:scrollPercent}}));
|
|
977
|
-
if(scrollTrigger == "every" && e.scrollY.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
977
|
+
if(scrollTrigger == "every" && scrollDir == e.scrollY.direction && e.scrollY.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
978
978
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:2, dir:scrollDir, percent:scrollPercent}}));
|
|
979
979
|
|
|
980
980
|
trigger[e.target[0]][className] = (scrollTrigger == "every" && e.scrollY.percent < scrollPercent);
|
|
@@ -1718,8 +1718,8 @@ $.fn.serializeObject = function () {
|
|
|
1718
1718
|
// Mouse events
|
|
1719
1719
|
if (mouseAction) {
|
|
1720
1720
|
|
|
1721
|
-
$(scroller).off("mouseenter.autoscroll touchstart.autoscroll");
|
|
1722
|
-
$(scroller).on("mouseenter.autoscroll touchstart.autoscroll", function() {
|
|
1721
|
+
$(scroller).off("mousewheel.autoscroll mouseenter.autoscroll touchstart.autoscroll");
|
|
1722
|
+
$(scroller).on("mousewheel.autoscroll mouseenter.autoscroll touchstart.autoscroll", function() {
|
|
1723
1723
|
|
|
1724
1724
|
if(autoscrollTimeout != undefined) clearTimeout(autoscrollTimeout);
|
|
1725
1725
|
$(scroller).prop("user-scroll", true);
|