mojs-player: refactor to _reset method

mojs · May 2, 2016 · f433260 · f433260
1 parent 7a5f0aa
commit f433260
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 106 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "mojs-player",
-  "version": "0.40.1",
+  "version": "0.40.3",
   "description": "Player controls for [mojs](mojs.io). Intended to help you to craft `mojs` animation sequences.",
   "main": "build/mojs-player.min.js",
   "authors": [

diff --git a/build/mojs-player.js b/build/mojs-player.js
@@ -1,3 +1,9 @@
+/*! 
+	:: MojsPlayer :: Player controls for [mojs](mojs.io). Intended to help you to craft `mojs` animation sequences.
+	Oleg Solomka @LegoMushroom 2016 MIT
+	0.40.3 
+*/
+
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -153,7 +159,7 @@
 	    this._defaults.isHidden = false;
 
 	    var str = 'mojs-player';
-	    this.revision = '0.40.1';
+	    this.revision = '0.40.3';
 	    this._prefix = str + '-' + this._hashCode(str) + '-';
 	    this._localStorage = this._prefix + 'model';
 	  };
@@ -430,12 +436,12 @@
 	    // if we set a progress in the `_play` method it returns slighly
 	    // different when piped thru tween, so add `0.01` gap to soften that
 	    if (p < leftBound - 0.01 && p !== 0) {
-	      this._sysTween.reset();
+	      this._reset();
 	      requestAnimationFrame(this._play.bind(this));
 	    }
 
 	    if (p >= rightBound) {
-	      this._sysTween.reset();
+	      this._reset();
 	      if (this._props.isRepeat) {
 	        requestAnimationFrame(this._play.bind(this));
 	      } else {
@@ -463,7 +469,16 @@
 
 	    this._sysTween.play();
 	  };
+	  /*
+	    Method to reset sysTween and timeline.
+	    @private
+	  */
 
+
+	  MojsPlayer.prototype._reset = function _reset() {
+	    this._sysTween.reset();
+	    this.timeline.reset();
+	  };
 	  /*
 	    Method to set play button state.
 	    @private
@@ -535,7 +550,7 @@
 
 	  MojsPlayer.prototype._onStop = function _onStop() {
 	    this._props.isPlaying = false;
-	    this._sysTween.reset();
+	    this._reset();
 	  };
 	  /*
 	    Method that is invoked on repeat switch state change.
@@ -601,8 +616,15 @@
 
 	  MojsPlayer.prototype._onProgress = function _onProgress(progress) {
 	    this._props.progress = progress;
-	    if (!this.timeline._prevTime) {
-	      this.timeline.setProgress(0);
+	    // if timeline was reset - refresh it's state
+	    // by incremental updates until progress (0 always)
+	    if (!this.timeline._prevTime && progress > 0) {
+	      var start = 0,
+	          step = 0.1;
+	      do {
+	        this.timeline.setProgress(start);
+	        start += step;
+	      } while (start + step < progress);
 	    }
 	    this.timeline.setProgress(progress);
 	  };
@@ -6742,24 +6764,19 @@
 
 
 	  Ripple.prototype._addRipple = function _addRipple() {
-	    var _ref;
+	    var _this2 = this,
+	        _ref;
 
 	    this.transit = new mojs.Transit((_ref = {
 	      parent: this.el,
 	      strokeWidth: { 10: 0 },
 	      fill: 'none',
-	      // stroke:       'white',
 	      stroke: 'hotpink'
-	    }, _ref['fill'] = 'hotpink', _ref.fillOpacity = .75, _ref.opacity = { .85: 0 }, _ref.radius = { 0: 40 }, _ref.isShowEnd = false, _ref.onStart = this._onStart.bind(this), _ref.onUpdate = this._onUpdate.bind(this), _ref));
-	  };
-	  /*
-	    Method that is invoked on ripple start.
-	    @private
-	  */
-
-
-	  Ripple.prototype._onStart = function _onStart() {
-	    this.isStart = true;
+	    }, _ref['fill'] = 'hotpink', _ref.fillOpacity = .75, _ref.opacity = { .85: 0 }, _ref.radius = { 0: 40 }, _ref.isShowEnd = false, _ref.onStart = function onStart() {
+	      _this2.isStart = true;
+	    }, _ref.onUpdate = this._onUpdate.bind(this), _ref.onComplete = function onComplete() {
+	      _this2.isStart = false;
+	    }, _ref));
 	  };
 	  /*
 	    Method that is invoked on ripple update.
@@ -6784,6 +6801,7 @@
 
 
 	  Ripple.prototype._release = function _release() {
+	    // console.log('release');
 	    if (!this._props.withHold) {
 	      return;
 	    }
@@ -6802,7 +6820,7 @@
 	        y = e.offsetY != null ? e.offsetY : e.layerY;
 
 	    this.isRelease = false;
-	    this.transit.tune({ x: x, y: y }).stop().replay();
+	    this.transit.tune({ x: x, y: y }).replay();
 	  };
 	  /*
 	    Method that should be run on touch serface cancel.

diff --git a/build/mojs-player.min.js b/build/mojs-player.min.js
diff --git a/js/components/ripple.babel.js b/js/components/ripple.babel.js
@@ -31,22 +31,17 @@ class Ripple extends Module {
       parent:       this.el,
       strokeWidth:  { 10 : 0 },
       fill:         'none',
-      // stroke:       'white',
       stroke:       'hotpink',
       fill:         'hotpink',
       fillOpacity:  .75,
       opacity:      { .85: 0 },
       radius:       { 0: 40 },
       isShowEnd:    false,
-      onStart:      this._onStart.bind( this ),
-      onUpdate:     this._onUpdate.bind( this )
+      onStart:      () => { this.isStart = true; },
+      onUpdate:     this._onUpdate.bind( this ),
+      onComplete:   () => { this.isStart = false; }
     });
   }
-  /*
-    Method that is invoked on ripple start.
-    @private
-  */
-  _onStart () { this.isStart = true; }
   /*
     Method that is invoked on ripple update.
     @private
@@ -64,6 +59,7 @@ class Ripple extends Module {
     @private
   */
   _release () {
+    // console.log('release');
     if ( !this._props.withHold ) { return; }
     this.isRelease = true;
     this.transit.setSpeed( 1 ).play();
@@ -78,7 +74,7 @@ class Ripple extends Module {
         y = ( e.offsetY != null ) ? e.offsetY : e.layerY;
 
     this.isRelease = false;
-    this.transit.tune({ x: x, y: y }).stop().replay();
+    this.transit.tune({ x: x, y: y }).replay();
   }
   /*
     Method that should be run on touch serface cancel.

diff --git a/js/mojs-player.babel.js b/js/mojs-player.babel.js
@@ -34,7 +34,7 @@ class MojsPlayer extends Module {
     this._defaults.isHidden     = false;
 
     let str            = 'mojs-player';
-    this.revision      = '0.40.1';
+    this.revision      = '0.40.3';
     this._prefix       = `${str}-${ this._hashCode( str ) }-`;
     this._localStorage = `${ this._prefix }model`;
   }
@@ -273,12 +273,12 @@ class MojsPlayer extends Module {
     // if we set a progress in the `_play` method it returns slighly
     // different when piped thru tween, so add `0.01` gap to soften that
     if ( p < leftBound - 0.01 && p !== 0 ) {
-      this._sysTween.reset();
+      this._reset();
       requestAnimationFrame(this._play.bind(this));
     }
 
     if ( p >= rightBound ) {
-      this._sysTween.reset();
+      this._reset();
       if ( this._props.isRepeat ) {
         requestAnimationFrame(this._play.bind(this));
       } else { this._props.isPlaying = false; }
@@ -299,7 +299,14 @@ class MojsPlayer extends Module {
 
     this._sysTween.play();
   }
-
+  /*
+    Method to reset sysTween and timeline.
+    @private
+  */
+  _reset () {
+    this._sysTween.reset();
+    this.timeline.reset();
+  }
   /*
     Method to set play button state.
     @private
@@ -355,7 +362,7 @@ class MojsPlayer extends Module {
   */
   _onStop ( ) {
     this._props.isPlaying = false;
-    this._sysTween.reset();
+    this._reset();
   }
   /*
     Method that is invoked on repeat switch state change.
@@ -403,8 +410,15 @@ class MojsPlayer extends Module {
   */
   _onProgress ( progress ) {
     this._props.progress = progress;
-    if ( !this.timeline._prevTime ) {
-      this.timeline.setProgress( 0 );
+    // if timeline was reset - refresh it's state
+    // by incremental updates until progress (0 always)
+    if ( !this.timeline._prevTime && progress > 0 ) {
+      let start = 0,
+          step  = 0.1;
+      do {
+        this.timeline.setProgress( start );
+        start += step;
+      } while ( start + step < progress );
     }
     this.timeline.setProgress( progress );
   }

diff --git a/lib/components/player-slider.js b/lib/components/player-slider.js
@@ -143,7 +143,9 @@ var PlayerSlider = function (_Module) {
       isBound: true,
       parent: this.el,
       isRipple: false,
-      onProgress: this._onLeftBoundProgress.bind(this)
+      onProgress: this._onLeftBoundProgress.bind(this),
+      onSeekStart: p.onSeekStart,
+      onSeekEnd: p.onSeekEnd
     });
 
     this.track = new _slider2.default({
@@ -158,7 +160,9 @@ var PlayerSlider = function (_Module) {
       parent: this.el,
       isRipple: false,
       isInversed: true,
-      onProgress: this._onRightBoundProgress.bind(this)
+      onProgress: this._onRightBoundProgress.bind(this),
+      onSeekStart: p.onSeekStart,
+      onSeekEnd: p.onSeekEnd
     });
 
     this.rightBound.setProgress(p.rightProgress);
@@ -188,6 +192,7 @@ var PlayerSlider = function (_Module) {
     if (!this._props.isBounds) {
       return;
     }
+    this._props.leftProgress = p;
     this.track.setMinBound(p);
     this.rightBound.setMinBound(p);
     this._callIfFunction(this._props.onLeftProgress, p);
@@ -203,6 +208,7 @@ var PlayerSlider = function (_Module) {
     if (!this._props.isBounds) {
       return;
     }
+    this._props.rightProgress = p;
     this.track.setMaxBound(p);
     this.leftBound.setMaxBound(p);
     this._callIfFunction(this._props.onRightProgress, p);

diff --git a/lib/components/ripple.js b/lib/components/ripple.js
@@ -54,24 +54,19 @@ var Ripple = function (_Module) {
 
 
   Ripple.prototype._addRipple = function _addRipple() {
-    var _ref;
+    var _this2 = this,
+        _ref;
 
     this.transit = new mojs.Transit((_ref = {
       parent: this.el,
       strokeWidth: { 10: 0 },
       fill: 'none',
-      // stroke:       'white',
       stroke: 'hotpink'
-    }, _ref['fill'] = 'hotpink', _ref.fillOpacity = .75, _ref.opacity = { .85: 0 }, _ref.radius = { 0: 40 }, _ref.isShowEnd = false, _ref.onStart = this._onStart.bind(this), _ref.onUpdate = this._onUpdate.bind(this), _ref));
-  };
-  /*
-    Method that is invoked on ripple start.
-    @private
-  */
-
-
-  Ripple.prototype._onStart = function _onStart() {
-    this.isStart = true;
+    }, _ref['fill'] = 'hotpink', _ref.fillOpacity = .75, _ref.opacity = { .85: 0 }, _ref.radius = { 0: 40 }, _ref.isShowEnd = false, _ref.onStart = function onStart() {
+      _this2.isStart = true;
+    }, _ref.onUpdate = this._onUpdate.bind(this), _ref.onComplete = function onComplete() {
+      _this2.isStart = false;
+    }, _ref));
   };
   /*
     Method that is invoked on ripple update.
@@ -96,6 +91,7 @@ var Ripple = function (_Module) {
 
 
   Ripple.prototype._release = function _release() {
+    // console.log('release');
     if (!this._props.withHold) {
       return;
     }