v1.7.3 - More refactoring

iDev-Games · Mar 30, 2023 · 9691e6e · 9691e6e
1 parent a103e13
commit 9691e6e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -34,10 +34,10 @@ npm i trig-js
 
 Use Trig.js from a CDN
 ```
-https://cdn.jsdelivr.net/npm/[email protected].2/dist/trig.js
+https://cdn.jsdelivr.net/npm/[email protected].3/dist/trig.js
 ```
 ```
-https://unpkg.com/[email protected].2/dist/trig.js
+https://unpkg.com/[email protected].3/dist/trig.js
 ```
 
 # What is Trig.js?
@@ -58,10 +58,10 @@ All you need to do is add the dist trig.js file into your projects JS folder and
 
 Or just add one of the below CDN instead
 ```
-<script src="https://unpkg.com/[email protected].2/dist/trig.js"></script>
+<script src="https://unpkg.com/[email protected].3/dist/trig.js"></script>
 ```
 ```
-<script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/trig.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/trig.js"></script>
 ```
 
 # How To Use?

diff --git a/dist/trig.js b/dist/trig.js
diff --git a/index.html b/index.html
@@ -203,10 +203,10 @@ <h2>How To Install?</h2>
                     </pre>
                     <p>Or just add one of the below CDN instead</p>
                     <pre>
-                        &lt;script src="https://unpkg.com/[email protected].2/dist/trig.js"&gt;&lt;/script&gt;
+                        &lt;script src="https://unpkg.com/[email protected].3/dist/trig.js"&gt;&lt;/script&gt;
                     </pre>
                     <pre>
-                        &lt;script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/trig.js"&gt;&lt;/script&gt;
+                        &lt;script src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/trig.js"&gt;&lt;/script&gt;
                     </pre>
                 </div>
             </div>

diff --git a/src/trig.js b/src/trig.js
@@ -1,24 +1,40 @@
-/* Trig.js v1.7.2 by iDev Games */
+/* Trig.js v1.7.3 by iDev Games */
 const trig = {
     trigs: [],
     thePos: [],
     documentHeight: 0,
+    observer: new IntersectionObserver(function(entries) {
+            trigObject.trigEntries(entries);
+            trigObject.updatePos(trigObject.trigs);
+            trigObject.observer.disconnect();
+    }),
     trigIntersecting: function(entry) {
         if (entry.isIntersecting) {
             entry.target.classList.add("trig");
         } else {
             entry.target.classList.remove("trig");
         }
     },
+    trigInit: function() {
+        trigObject.trigs = document.querySelectorAll('.enable-trig,[data-trig]');
+        trigObject.documentHeight = innerHeight;
+        trigObject.trigScroll();
+    },
+    trigScroll: function(){
+        if (trigObject.trigs) {
+            trigObject.trigs.forEach(function(element, index) {
+                element.index = index;
+                trigObject.observer.observe(element);
+            });
+        }
+    },
     trigEntries: function(entries) {
         entries.forEach(function(entry) {
             trigObject.trigIntersecting(entry);
             trigObject.trigPos(entry);
         });
     },
-    trigSetPos: function(el, min, max, entry, offset) {
-        var posTop = 0 - (el - ((trigObject.documentHeight / 2) + offset));
-        var pos = (posTop / trigObject.documentHeight) * 100;
+    trigSetPos: function(pos, min, max, entry) {
         if (pos >= min && pos <= max) {
             trigObject.thePos[entry.target.index] = pos;
         } else if (pos <= min) {
@@ -41,7 +57,9 @@ const trig = {
         if (entry.target.dataset.trigMax) {
             max = parseInt(entry.target.dataset.trigMax);
         }
-        trigObject.trigSetPos(el, min, max, entry, offset);
+        var posTop = 0 - (el - ((trigObject.documentHeight / 2) + offset));
+        var pos = (posTop / trigObject.documentHeight) * 100;
+        trigObject.trigSetPos(pos, min, max, entry);
     },
     updatePos: function() {
         trigObject.trigs.forEach(function(element, index) {
@@ -56,29 +74,8 @@ const trig = {
     }
 };
 
-const observer = new IntersectionObserver(function(entries) {
-    trigObject.trigEntries(entries);
-    trigObject.updatePos(trigObject.trigs);
-    observer.disconnect();
-});
-
 const trigObject = Object.create(trig);
 
-document.addEventListener('scroll', trigScroll, false);
-document.addEventListener('resize', trigInit, false);
-document.addEventListener('DOMContentLoaded', trigInit, false);
-
-function trigInit(){
-    trigObject.trigs = document.querySelectorAll('.enable-trig,[data-trig]');
-    trigObject.documentHeight = innerHeight;
-    trigScroll();
-}
-
-function trigScroll() {
-    if (trigObject.trigs) {
-        trigObject.trigs.forEach(function(element, index) {
-            element.index = index;
-            observer.observe(element);
-        });
-    }
-}
+document.addEventListener('scroll', trigObject.trigScroll, false);
+document.addEventListener('resize', trigObject.trigInit, false);
+document.addEventListener('DOMContentLoaded', trigObject.trigInit, false);