@checksub_team/peaks_timeline 1.4.43 → 1.4.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@checksub_team/peaks_timeline",
-  "version": "1.4.43",
+  "version": "1.4.44",
   "description": "JavaScript UI component for displaying audio waveforms",
   "main": "./peaks.js",
   "types": "./peaks.js.d.ts",

package/peaks.js

@@ -16018,12 +16018,18 @@ module.exports = function (Utils) {
         return this._currentTime;
     };
     Player.prototype.seek = function (time) {
+        if (!this._seek(time)) {
+            return;
+        }
+        this._peaks.emit('timeline.seek', this._currentTime);
+    };
+    Player.prototype._seek = function (time) {
         if (!Utils.isValidTime(time)) {
             this._peaks.logger('peaks.player.seek(): parameter must be a valid time, in seconds');
-            return;
+            return false;
         }
         this._currentTime = Math.max(0, time);
-        this._peaks.emit('timeline.seek', this._currentTime);
+        return true;
     };
     Player.prototype.playSegment = function (segment) {
         var self = this;
@@ -16088,6 +16094,9 @@ module.exports = function (Utils, Konva) {
     PlayheadLayer.prototype.addToStage = function (stage) {
         stage.add(this._playheadLayer);
     };
+    PlayheadLayer.prototype.listening = function (bool) {
+        this._playheadLayer.listening(bool);
+    };
     PlayheadLayer.prototype.zoomLevelChanged = function () {
         var pixelsPerSecond = this._view.timeToPixels(1);
         var time;
@@ -16135,9 +16144,9 @@ module.exports = function (Utils, Konva) {
                 var time = Math.max(0, self._view.pixelsToTime(pos.x + self._view.getFrameOffset()));
                 var autoPos = self._view.updateWithAutoScroll(this, function () {
                     time = Math.max(0, self._view.pixelsToTime(self._view.getPointerPosition().x + self._view.getFrameOffset()));
-                    self._peaks.player.seek(time);
+                    self._onPlayheadDrag(time);
                 }, function () {
-                    self._peaks.player.seek(time);
+                    self._onPlayheadDrag(time);
                 });
                 return {
                     x: autoPos.x,
@@ -16151,6 +16160,11 @@ module.exports = function (Utils, Konva) {
         this._playheadGroup.add(this._playheadLine);
         this._playheadLayer.add(this._playheadGroup);
     };
+    PlayheadLayer.prototype._onPlayheadDrag = function (time) {
+        if (self._peaks.player._seek(time)) {
+            self._peaks.emit('playhead.drag', self._peaks.player.getCurrentTime());
+        }
+    };
     PlayheadLayer.prototype._onPlayheadDragStart = function () {
         this._view.enableAutoScroll(false);
         this._dragging = true;
@@ -16163,6 +16177,7 @@ module.exports = function (Utils, Konva) {
             clearInterval(this._playheadGroup._scrollingInterval);
             this._playheadGroup._scrollingInterval = null;
         }
+        this._peaks.emit('playhead.dragend', this._peaks.player.getCurrentTime());
     };
     PlayheadLayer.prototype._createPlayheadText = function (color) {
         this._playheadText = new Konva.Text({
@@ -19353,6 +19368,8 @@ module.exports = function (MouseDragHandler, PlayheadLayer, SourcesLayer, ModeLa
         self._onCutMode = self._onCutMode.bind(self);
         self._peaks.on('timeline.update', self._onTimeUpdate);
         self._peaks.on('timeline.seek', self._onTimeUpdate);
+        self._peaks.on('playhead.drag', self._onTimeUpdate);
+        self._peaks.on('playhead.dragend', self._onTimeUpdate);
         self._peaks.on('user_seek', self._onSeek);
         self._peaks.on('timeline.play', self._onPlay);
         self._peaks.on('timeline.pause', self._onPause);
@@ -19543,6 +19560,7 @@ module.exports = function (MouseDragHandler, PlayheadLayer, SourcesLayer, ModeLa
     };
     TimelineZoomView.prototype.overrideInteractions = function (bool, areInteractionsAllowed) {
         this._sourcesLayer._lines.overrideInteractions(bool, areInteractionsAllowed);
+        this._playheadLayer.listening(areInteractionsAllowed);
         this._sourcesLayer.stopDrag();
         this._sourcesLayer.draw();
     };

package/src/player.js

@@ -128,14 +128,21 @@ define([
    */
 
   Player.prototype.seek = function(time) {
+    if (!this._seek(time)) {
+      return;
+    }
+
+    this._peaks.emit('timeline.seek', this._currentTime);
+  };
+
+  Player.prototype._seek = function(time) {
     if (!Utils.isValidTime(time)) {
       this._peaks.logger('peaks.player.seek(): parameter must be a valid time, in seconds');
-      return;
+      return false;
     }
 
     this._currentTime = Math.max(0, time);
-
-    this._peaks.emit('timeline.seek', this._currentTime);
+    return true;
   };
 
   /**

package/src/playhead-layer.js

@@ -85,6 +85,10 @@ define([
     stage.add(this._playheadLayer);
   };
 
+  PlayheadLayer.prototype.listening = function(bool) {
+    this._playheadLayer.listening(bool);
+  };
+
   /**
    * Decides whether to use an animation to update the playhead position.
    *
@@ -180,10 +184,10 @@ define([
               )
             );
 
-            self._peaks.player.seek(time);
+            self._onPlayheadDrag(time);
           },
           function() {
-            self._peaks.player.seek(time);
+            self._onPlayheadDrag(time);
           }
         );
 
@@ -202,6 +206,12 @@ define([
     this._playheadLayer.add(this._playheadGroup);
   };
 
+  PlayheadLayer.prototype._onPlayheadDrag = function(time) {
+    if (self._peaks.player._seek(time)) {
+      self._peaks.emit('playhead.drag', self._peaks.player.getCurrentTime());
+    }
+  };
+
   PlayheadLayer.prototype._onPlayheadDragStart = function() {
     this._view.enableAutoScroll(false);
     this._dragging = true;
@@ -215,6 +225,7 @@ define([
       clearInterval(this._playheadGroup._scrollingInterval);
       this._playheadGroup._scrollingInterval = null;
     }
+    this._peaks.emit('playhead.dragend', this._peaks.player.getCurrentTime());
   };
 
   PlayheadLayer.prototype._createPlayheadText = function(color) {

package/src/timeline-zoomview.js

@@ -56,6 +56,8 @@ define([
     // Register event handlers
     self._peaks.on('timeline.update', self._onTimeUpdate);
     self._peaks.on('timeline.seek', self._onTimeUpdate);
+    self._peaks.on('playhead.drag', self._onTimeUpdate);
+    self._peaks.on('playhead.dragend', self._onTimeUpdate);
     self._peaks.on('user_seek', self._onSeek);
     self._peaks.on('timeline.play', self._onPlay);
     self._peaks.on('timeline.pause', self._onPause);
@@ -352,6 +354,7 @@ define([
 
   TimelineZoomView.prototype.overrideInteractions = function(bool, areInteractionsAllowed) {
     this._sourcesLayer._lines.overrideInteractions(bool, areInteractionsAllowed);
+    this._playheadLayer.listening(areInteractionsAllowed);
     this._sourcesLayer.stopDrag();
     this._sourcesLayer.draw();
   };