@glitchr/stickyjs 1.0.31 → 1.0.32

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/css/index.css +2 -2
  3. package/src/js/sticky.js +17 -16
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@glitchr/stickyjs",
3
- "version": "1.0.31",
3
+ "version": "1.0.32",
4
4
  "description": "Sticky scroll library",
5
5
  "main": "src/index.js",
6
6
  "repository": {
package/src/css/index.css CHANGED
@@ -70,11 +70,11 @@ html { scroll-behavior: unset !important; }
70
70
  opacity:0;
71
71
  }
72
72
 
73
- .sticky-autoscroll
73
+ /* .sticky-autoscroll
74
74
  {
75
75
  max-height: 100vh;
76
76
  max-width: 100vw;
77
- }
77
+ } */
78
78
 
79
79
 
80
80
  .sticky-swipehint:not(.sticky-swipehint-reveal) .sticky-swipehint-container { display:none; }
package/src/js/sticky.js CHANGED
@@ -936,7 +936,8 @@ $.fn.serializeObject = function () {
936
936
  var classList = e.target.length ? e.target[0].classList : [];
937
937
  classList.forEach(function(className) {
938
938
 
939
- if(!(e.target[0] in trigger)) trigger[e.target[0]] = {};
939
+ target = e.target[0] == $("html")[0] ? window : e.target[0];
940
+ if(!(target in trigger)) trigger[target] = {};
940
941
 
941
942
  var regex = /sticky-scrollpercent(?:-(from|every|once)){0,1}-(\d+)([udlr]){0,1}/gi;
942
943
  if( (match = regex.exec(className)) ) {
@@ -957,19 +958,19 @@ $.fn.serializeObject = function () {
957
958
 
958
959
  var scrollPercentX = scrollDirX == "left" ? 100-scrollPercent : scrollPercent;
959
960
 
960
- if(!(className in trigger[e.target[0]])) trigger[e.target[0]][className] = true;
961
+ if(!(className in trigger[target])) trigger[target][className] = true;
961
962
 
962
963
  if(scrollTrigger == "from" && scrollDirX == e.scrollX.direction && e.scrollX.percent >= scrollPercentX)
963
- e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:0, dir:scrollDirX, percent:scrollPercentX}}));
964
- if(scrollTrigger == "once" && scrollDirX == e.scrollX.direction && e.scrollX.percent >= scrollPercentX && trigger[e.target[0]][className])
965
- e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:1, dir:scrollDirX, percent:scrollPercentX}}));
964
+ target.dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:0, dir:scrollDirX, percent:scrollPercentX}}));
965
+ if(scrollTrigger == "once" && scrollDirX == e.scrollX.direction && e.scrollX.percent >= scrollPercentX && trigger[target][className])
966
+ target.dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:1, dir:scrollDirX, percent:scrollPercentX}}));
966
967
 
967
968
  if(scrollTrigger == "every" && scrollDirX == e.scrollX.direction && e.scrollX.percent < scrollPercentX )
968
- trigger[e.target[0]][className] = true;
969
- if(scrollTrigger == "every" && scrollDirX == e.scrollX.direction && e.scrollX.percent >= scrollPercentX && trigger[e.target[0]][className])
970
- e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:2, dir:scrollDirX, percent:scrollPercentX}}));
969
+ trigger[target][className] = true;
970
+ if(scrollTrigger == "every" && scrollDirX == e.scrollX.direction && e.scrollX.percent >= scrollPercentX && trigger[target][className])
971
+ target.dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:2, dir:scrollDirX, percent:scrollPercentX}}));
971
972
 
972
- trigger[e.target[0]][className] = (scrollTrigger == "every" && e.scrollX.percent < scrollPercentX);
973
+ trigger[target][className] = (scrollTrigger == "every" && e.scrollX.percent < scrollPercentX);
973
974
  }
974
975
  }
975
976
 
@@ -980,15 +981,15 @@ $.fn.serializeObject = function () {
980
981
 
981
982
  var scrollPercentY = scrollDirY == "up" ? 100-scrollPercent : scrollPercent;
982
983
 
983
- if(!className in trigger[e.target[0]]) trigger[e.target[0]][className] = true;
984
+ if(!className in trigger[target]) trigger[target][className] = true;
984
985
  if(scrollTrigger == "from" && scrollDirY == e.scrollY.direction && e.scrollY.percent >= scrollPercentY)
985
- e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:0, dir:scrollDirY, percent:scrollPercentY}}));
986
- if(scrollTrigger == "once" && scrollDirY == e.scrollY.direction && e.scrollY.percent >= scrollPercentY && trigger[e.target[0]][className])
987
- e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:1, dir:scrollDirY, percent:scrollPercentY}}));
988
- if(scrollTrigger == "every" && scrollDirY == e.scrollY.direction && e.scrollY.percent >= scrollPercentY && trigger[e.target[0]][className])
989
- e.target[0].dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:2, dir:scrollDirY, percent:scrollPercentY}}));
986
+ target.dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:0, dir:scrollDirY, percent:scrollPercentY}}));
987
+ if(scrollTrigger == "once" && scrollDirY == e.scrollY.direction && e.scrollY.percent >= scrollPercentY && trigger[target][className])
988
+ target.dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:1, dir:scrollDirY, percent:scrollPercentY}}));
989
+ if(scrollTrigger == "every" && scrollDirY == e.scrollY.direction && e.scrollY.percent >= scrollPercentY && trigger[target][className])
990
+ target.dispatchEvent(new CustomEvent("scrollpercent", {detail: {scroll:e, trigger:2, dir:scrollDirY, percent:scrollPercentY}}));
990
991
 
991
- trigger[e.target[0]][className] = (scrollTrigger == "every" && e.scrollY.percent < scrollPercentY);
992
+ trigger[target][className] = (scrollTrigger == "every" && e.scrollY.percent < scrollPercentY);
992
993
  }
993
994
  }
994
995
  }