Refactor event sequence to avoid confusion

dustinkerstein · Apr 23, 2020 · 4f47703 · 4f47703
1 parent b0b7b43
commit 4f47703
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/src/panorama/PanoMomentPanorama.js b/src/panorama/PanoMomentPanorama.js
@@ -44,7 +44,7 @@ function PanoMomentPanorama ( identifier, options = {} ) {
     // Event Listeners
     this.addEventListener( 'panolens-camera', data => this.onPanolensCamera( data ) );
     this.addEventListener( 'panolens-controls', data => this.onPanolensControls( data ) );
-    this.addEventListener( 'enter-start', () => this.enter() );
+    this.addEventListener( 'enter-fade-start', () => this.enter() );
     this.addEventListener( 'leave-complete', () => this.leave() );
     this.addEventListener( PANOMOMENT.LOAD, () => this.disableControl() );
     this.addEventListener( PANOMOMENT.READY, () => this.enableControl() );

diff --git a/src/panorama/Panorama.js b/src/panorama/Panorama.js
@@ -254,6 +254,13 @@ Panorama.prototype = Object.assign( Object.create( THREE.Mesh.prototype ), {
          */
         this.dispatchEvent( { type: 'loaded' } );
 
+        /**
+         * Panorama is ready to go
+         * @event Panorama#ready
+         * @type {object} 
+         */
+        this.dispatchEvent( { type: 'ready' } );
+
     },
 
     /**
@@ -629,7 +636,12 @@ Panorama.prototype = Object.assign( Object.create( THREE.Mesh.prototype ), {
 
                 if ( this.loaded ) {
 
-                    this.fadeIn( duration );
+                    /**
+                     * Panorama is ready to go
+                     * @event Panorama#ready
+                     * @type {object} 
+                     */
+                    this.dispatchEvent( { type: 'ready' } );
 
                 } else {
 

diff --git a/src/viewer/Viewer.js b/src/viewer/Viewer.js
@@ -349,7 +349,7 @@ Viewer.prototype = Object.assign( Object.create( THREE.EventDispatcher.prototype
 
                 } else {
 
-                    ep.onEnter();
+                    ep.fadeIn();
 
                 }
 
@@ -359,7 +359,7 @@ Viewer.prototype = Object.assign( Object.create( THREE.EventDispatcher.prototype
 
                 const onLeaveComplete = () => {
 
-                    ep.onEnter();
+                    ep.fadeIn();
                     lp.removeEventListener( 'leave-complete', onLeaveComplete );
 
                 };
@@ -368,25 +368,17 @@ Viewer.prototype = Object.assign( Object.create( THREE.EventDispatcher.prototype
 
             }
 
-            if( ep.loaded ) {
+            const onReady = () => {
 
                 onSwitch();
+                ep.removeEventListener( 'ready', onReady );
 
-            } else {
-
-                const onLoaded = () => {
-
-                    onSwitch();
-                    ep.removeEventListener( 'loaded', onLoaded );
-
-                };
-
-                ep.addEventListener( 'loaded', onLoaded );
-                ep.load();
+            };
 
-            }
+            ep.addEventListener( 'ready', onReady );
 
             this.panorama = ep;
+            this.panorama.onEnter();
 
         }