@glitchr/stickyjs 1.0.24 → 1.0.25
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/js/sticky.js +3 -4
package/package.json
CHANGED
package/src/js/sticky.js
CHANGED
|
@@ -936,7 +936,7 @@ $.fn.serializeObject = function () {
|
|
|
936
936
|
|
|
937
937
|
if(!(e.target[0] in trigger)) trigger[e.target[0]] = {};
|
|
938
938
|
|
|
939
|
-
var regex = /scrollpercent(?:-(from|every|once)){0,1}-(\d+)(udlr){0,1}/gi;
|
|
939
|
+
var regex = /sticky-scrollpercent(?:-(from|every|once)){0,1}-(\d+)(udlr){0,1}/gi;
|
|
940
940
|
if( (match = regex.exec(className)) ) {
|
|
941
941
|
|
|
942
942
|
var scrollTrigger = match[1] || "every";
|
|
@@ -950,7 +950,7 @@ $.fn.serializeObject = function () {
|
|
|
950
950
|
var scrollPercent = parseInt(match[2]);
|
|
951
951
|
if(scrollDir == "up" || scrollDir == "left") scrollPercent = 100-scrollPercent;
|
|
952
952
|
|
|
953
|
-
if(e.scrollX.direction !== undefined && e.scrollX.delta) {
|
|
953
|
+
if((e.scrollX.direction !== undefined && e.scrollX.delta) || scrollPercent == 100) {
|
|
954
954
|
|
|
955
955
|
if(!(className in trigger[e.target[0]])) trigger[e.target[0]][className] = true;
|
|
956
956
|
if(scrollTrigger == "from" && e.scrollX.percent >= scrollPercent)
|
|
@@ -966,14 +966,13 @@ $.fn.serializeObject = function () {
|
|
|
966
966
|
trigger[e.target[0]][className] = (scrollTrigger == "every" && e.scrollX.percent < scrollPercent);
|
|
967
967
|
}
|
|
968
968
|
|
|
969
|
-
if(e.scrollY.direction !== undefined && e.scrollY.delta) {
|
|
969
|
+
if((e.scrollY.direction !== undefined && e.scrollY.delta) || scrollPercent == 100) {
|
|
970
970
|
|
|
971
971
|
if(!className in trigger[e.target[0]]) trigger[e.target[0]][className] = true;
|
|
972
972
|
if(scrollTrigger == "from" && e.scrollY.percent >= scrollPercent)
|
|
973
973
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:0, dir:scrollDir, percent:scrollPercent}}));
|
|
974
974
|
if(scrollTrigger == "once" && e.scrollY.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
975
975
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:1, dir:scrollDir, percent:scrollPercent}}));
|
|
976
|
-
|
|
977
976
|
if(scrollTrigger == "every" && e.scrollY.percent >= scrollPercent && trigger[e.target[0]][className])
|
|
978
977
|
e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:2, dir:scrollDir, percent:scrollPercent}}));
|
|
979
978
|
|