@checksub_team/peaks_timeline 1.15.8-alpha.0 → 1.15.9

package/package.json

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

package/peaks.js

@@ -14446,7 +14446,7 @@ module.exports = function (Data) {
         var data = new Data();
         this._data[url] = data;
         this._waitingForData[url] = [source];
-        this._fetch(url, data, 1000, 10);
+        this._fetch(url, data, 2000, 3);
     };
     DataRetriever.prototype._fetch = function (url, data, delay, limit) {
         var self = this;
@@ -14459,12 +14459,15 @@ module.exports = function (Data) {
             if (timesTried >= limit) {
                 return Promise.reject(err);
             }
-            return fetch(url).catch(function (err) {
-                later(delay).then(function () {
-                    recur(timesTried + 1, err);
-                });
-            }).then(function (response) {
+            return fetch(url).then(function (response) {
+                if (!response.ok) {
+                    throw new Error('HTTP ' + response.status + ': ' + response.statusText);
+                }
                 return response.blob();
+            }).catch(function (err) {
+                return later(delay).then(function () {
+                    return recur(timesTried + 1, err);
+                });
             }).then(function (blob) {
                 var type = blob.type;
                 if (type) {
@@ -20451,6 +20454,13 @@ module.exports = function (SourceGroup, Lines, DataRetriever, Utils, Invoker, Ko
         const draggedElementId = element.currentTarget.attrs.sourceId;
         const shouldDragSelectedElements = Object.keys(this._view.getSelectedElements()).includes(draggedElementId);
         this._nonSelectedElement = shouldDragSelectedElements ? null : [this._sourcesGroup[draggedElementId].getSource()];
+        this._isDraggable = true;
+        (this._nonSelectedElement || Object.values(this._view.getSelectedElements())).forEach(function (source) {
+            if (!source.draggable) {
+                this._isDraggable = false;
+                return;
+            }
+        }.bind(this));
     };
     SourcesLayer.prototype.onSourcesGroupDragEnd = function () {
         const updatedSources = (this._nonSelectedElement || Object.values(this._view.getSelectedElements())).map(function (source) {
@@ -20488,7 +20498,9 @@ module.exports = function (SourceGroup, Lines, DataRetriever, Utils, Invoker, Ko
             }
             const {initialStartTime, initialEndTime} = this._activeElements[source.id];
             newEnd = Math.max(newEnd, source.endTime);
-            shouldRedraw = this.updateSource(source, initialStartTime + diff + timeOffsetDiff, initialEndTime + diff + timeOffsetDiff, mousePosY) || shouldRedraw;
+            if (this._isDraggable) {
+                shouldRedraw = this.updateSource(source, initialStartTime + diff + timeOffsetDiff, initialEndTime + diff + timeOffsetDiff, mousePosY) || shouldRedraw;
+            }
         }.bind(this));
         if (shouldRedraw) {
             this.draw();

package/src/data-retriever.js

@@ -59,7 +59,7 @@ define([
         this._data[url] = data;
         this._waitingForData[url] = [source];
 
-        this._fetch(url, data, 1000, 10);
+        this._fetch(url, data, 2000, 3);
     };
 
     DataRetriever.prototype._fetch = function(url, data, delay, limit) {
@@ -77,15 +77,19 @@ define([
             }
 
             return fetch(url)
+                .then(function(response) {
+                    if (!response.ok) {
+                        throw new Error('HTTP ' + response.status + ': ' + response.statusText);
+                    }
+
+                    return response.blob();
+                })
                 .catch(function(err) {
-                    later(delay)
+                    return later(delay)
                         .then(function() {
-                            recur(timesTried + 1, err);
+                            return recur(timesTried + 1, err);
                         });
                 })
-                .then(function(response) {
-                    return response.blob();
-                })
                 .then(function(blob) {
                     var type = blob.type;
 

package/src/line.js

@@ -643,14 +643,6 @@ define([
     return newTimes;
   };
 
-  // Line.prototype.rescale = function() {
-  //   for (var sourceId in this._sourcesGroup) {
-  //     if (Utils.objectHasProperty(this._sourcesGroup, sourceId)) {
-  //       this._sourcesGroup[sourceId].rescale();
-  //     }
-  //   }
-  // };
-
   Line.prototype.getSourcesAfter = function(time) {
     const sources = [];
     var currentId = this._firstSourceId;

package/src/lines.js

@@ -384,14 +384,6 @@ define([
     return this._linesBySourceId[source.id].manageSourceOrder(source, newTimes);
   };
 
-  // Lines.prototype.rescale = function() {
-  //   for (var position in this._linesByPosition) {
-  //     if (Utils.objectHasProperty(this._linesByPosition, position)) {
-  //       this._linesByPosition[position].rescale();
-  //     }
-  //   }
-  // };
-
   Lines.prototype._setInteractions = function(position) {
     var line = this._linesByPosition[position];
 

package/src/sources-layer.js

@@ -348,6 +348,14 @@ define([
     this._nonSelectedElement = shouldDragSelectedElements ?
       null :
       [this._sourcesGroup[draggedElementId].getSource()];
+
+    this._isDraggable = true;
+    (this._nonSelectedElement || Object.values(this._view.getSelectedElements())).forEach(function(source) {
+      if (!source.draggable) {
+        this._isDraggable = false;
+        return;
+      }
+    }.bind(this));
   };
 
   SourcesLayer.prototype.onSourcesGroupDragEnd = function() {
@@ -407,12 +415,14 @@ define([
 
       newEnd = Math.max(newEnd, source.endTime);
 
-      shouldRedraw = this.updateSource(
-        source,
-        initialStartTime + diff + timeOffsetDiff,
-        initialEndTime + diff + timeOffsetDiff,
-        mousePosY
-      ) || shouldRedraw;
+      if (this._isDraggable) {
+        shouldRedraw = this.updateSource(
+          source,
+          initialStartTime + diff + timeOffsetDiff,
+          initialEndTime + diff + timeOffsetDiff,
+          mousePosY
+        ) || shouldRedraw;
+      }
     }.bind(this));
 
     if (shouldRedraw) {
@@ -635,7 +645,6 @@ define([
   };
 
   SourcesLayer.prototype.rescale = function(debounce) {
-    // this._lines.rescale();
     if (debounce) {
       this._debouncedRescale();
     }