rytm-webflow 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rytm-webflow",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "rytm webflow pack - ASwap, ShowUp",
   "main": "scripts/index.js",
   "scripts": {

package/scripts/aswap/ASwap.js

@@ -33,6 +33,7 @@ class ASwap {
       onRequestUrl: () => {},
       onRequestLoad: () => {},
       onRequestLoaded: () => {},
+      onRequestSameUrl: () => {},
       onViewHide: () => {},
       onViewHidden: () => {},
       onViewSwapStart: () => {},
@@ -63,6 +64,7 @@ class ASwap {
     this.dispatcher.on(Events.NAV_REQUEST_URL, this.onRequestUrl.bind(this));
     this.dispatcher.on(Events.NAV_REQUEST_LOAD, this.onRequestLoad.bind(this));
     this.dispatcher.on(Events.NAV_REQUEST_LOADED, this.onRequestLoaded.bind(this));
+    this.dispatcher.on(Events.NAV_REQUEST_SAME_URL, this.onRequestSameUrl.bind(this));
     this.dispatcher.on(Events.NAV_VIEW_HIDE, this.onViewHide.bind(this));
     this.dispatcher.on(Events.NAV_VIEW_HIDDEN, this.onViewHidden.bind(this));
     this.dispatcher.on(Events.NAV_SWAP_START, this.onViewSwapStart.bind(this));
@@ -82,7 +84,7 @@ class ASwap {
   **/
   openURL(url, noHistory = false, useCache = true) {
     if (this.dispatcher) {
-      this.dispatcher.openURL(url, noHistory, useCache)
+      this.dispatcher.openURL(url, noHistory, useCache);
     }
   }
 
@@ -91,7 +93,7 @@ class ASwap {
     this.getActiveControlles().forEach( (c, index)=> {
       c.onRequestUrl(e);
     });
-    this.events.onRequestUrl()
+    this.events.onRequestUrl();
   }
   onRequestLoad(e) {
     document.documentElement.classList.add('js');
@@ -99,14 +101,17 @@ class ASwap {
     this.getActiveControlles().forEach( (c, index)=> {
       c.onRequestLoad(e);
     })
-    this.events.onRequestLoad()
+    this.events.onRequestLoad();
   }
   onRequestLoaded(e) {
     this.getControllersFromContainer(e.target.freshContent).forEach( (c, index)=> {
       c.onRequestLoaded(e);
     });
     document.documentElement.classList.remove("as-request-loading");
-    this.events.onRequestLoaded()
+    this.events.onRequestLoaded();
+  }
+  onRequestSameUrl(e) {
+    this.events.onRequestSameUrl();
   }
   onViewHide(e) {
     document.documentElement.classList.add('as-hide');
@@ -116,7 +121,7 @@ class ASwap {
         c.onViewHide(e);
       }
     });
-    this.events.onViewHide()
+    this.events.onViewHide();
   }
   onViewHidden(e) {
     document.documentElement.classList.remove('as-hide');
@@ -126,26 +131,26 @@ class ASwap {
         c.onViewHidden(e);
       }
     });
-    this.events.onViewHidden()
+    this.events.onViewHidden();
   }
   onViewSwapStart(e) {
     this.getControllersFromContainer(e.target.freshContent).forEach( (c, index)=> {
       c.onViewSwapStart(e);
     });
-    this.events.onViewSwapStart()
+    this.events.onViewSwapStart();
   }
   onViewSwapComplete(e) {
     this.getControllersFromContainer(e.target.freshContent).forEach( (c, index)=> {
       c.onViewSwapComplete(e);
     });
-    this.events.onViewSwapComplete()
+    this.events.onViewSwapComplete();
   }
   onViewShow(e) {
     document.documentElement.classList.add('as-show');
     this.getControllersFromContainer(e.target.freshContent).forEach( (c, index)=> {
       c.onViewShow(e);
     });
-    this.events.onViewShow()
+    this.events.onViewShow();
   }
   onViewShown(e) {
     document.documentElement.classList.add('as-show');

package/scripts/aswap/ASwapDispatcher.js

@@ -310,6 +310,7 @@ class ASwapDispatcher extends EventDispatcher {
     // check if url changed
     if (url == this.getCurrentUrl()) {
       this.trace("url didn't change", url);
+      this.dispatch(Events.NAV_REQUEST_SAME_URL);
       if (this.refreshOnSameUrl) {
         window.location.href = url;
       }

package/scripts/aswap/Events.js

@@ -3,6 +3,7 @@ const Events = {
   NAV_REQUEST_URL: "nav_open_url",
   NAV_REQUEST_LOAD: "nav_request_load",
   NAV_REQUEST_LOADED: "nav_request_loaded",
+  NAV_REQUEST_SAME_URL: "nav_same_url",
   
   // * animation related events: hide / hidden / show / shown
   NAV_VIEW_HIDE: "nav_veiw_hide",

package/scripts/aswap/WebflowListView.js

@@ -52,7 +52,7 @@ class WebflowListView extends View {
     const propsInitial = this.getTweenProps(el, DATA_ATTR_WEBSCROLL_INIT);
     const propsShow = this.getTweenProps(el, DATA_ATTR_WEBSCROLL_SHOW);
     if (propsInitial && propsShow) {
-      delay = delay + (propsShow.delay || 0);
+      delay = delay + (propsShow.tween.delay || 0);
       gsap.killTweensOf(el);
       gsap.set(el, {...propsInitial.tween});
       gsap.to(el, {duration: propsShow.time, ...propsShow.tween, delay});