Merge branch 'master' of github.com:katspaugh/wavesurfer.js

katspaugh · Apr 24, 2019 · 1ec2a19 · 1ec2a19
2 parents d4d1913 + fa93fe7
commit 1ec2a19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/example/timeline/index.html b/example/timeline/index.html
@@ -107,6 +107,7 @@ <h4>Options</h4>
                       <li><code>primaryLabelInterval</code> - number of primary time labels. (Integer or function which receives pxPerSec value and reurns value)</li>
                       <li><code>secondaryLabelInterval</code> - number of secondary time labels (Time labels between primary labels, integer or function which receives pxPerSec value and reurns value).</li>
                       <li><code>formatTimeCallback</code> - custom time format callback. (Function which receives number of seconds and returns formatted string)</li>
+                      <li><code>offset</code> - offset (in seconds) for the start of the timeline. The value may also be negative and the default is 0.</li>
                     </ul>
                 </div>
             </div>

diff --git a/src/plugin/timeline.js b/src/plugin/timeline.js
@@ -26,6 +26,8 @@
  * labels in primary color
  * @property {function} secondaryLabelInterval (pxPerSec) -> cadence between
  * labels in secondary color
+ * @property {?number} offset Offset for the timeline start in seconds. May also be
+ * negative.
  * @property {?boolean} deferInit Set to true to manually call
  * `initPlugin('timeline')`
  */
@@ -151,7 +153,8 @@ export default class TimelinePlugin {
                 formatTimeCallback: this.defaultFormatTimeCallback,
                 timeInterval: this.defaultTimeInterval,
                 primaryLabelInterval: this.defaultPrimaryLabelInterval,
-                secondaryLabelInterval: this.defaultSecondaryLabelInterval
+                secondaryLabelInterval: this.defaultSecondaryLabelInterval,
+                offset: 0
             },
             params
         );
@@ -376,7 +379,7 @@ export default class TimelinePlugin {
             this.params.secondaryLabelInterval
         );
 
-        let curPixel = 0;
+        let curPixel = pixelsPerSecond * this.params.offset;
         let curSeconds = 0;
         let i;
         // build an array of position data with index, second and pixel data,