handle out-of-bound markers more gracefully (hide them)

spchuang · Dec 13, 2017 · f401c74 · f401c74
1 parent 490308b
commit f401c74
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/demo/example.html b/demo/example.html
@@ -105,7 +105,7 @@
             text: ":)"
          },
          {
-            time: 999,
+            time: 300,
             text: "too far"
          }
       ]

diff --git a/dist/videojs-markers.js b/dist/videojs-markers.js
diff --git a/dist/videojs-markers.js.map b/dist/videojs-markers.js.map
diff --git a/dist/videojs-markers.min.js b/dist/videojs-markers.min.js
diff --git a/src/videojs.markers.js b/src/videojs.markers.js
@@ -184,6 +184,12 @@ function registerVideoJsMarkersPlugin(options) {
       markerDiv.style[key] = setting.markerStyle[key];
     });
 
+    // hide out-of-bound markers
+    const ratio = marker.time / player.duration();
+    if (ratio < 0 || ratio > 1) {
+      markerDiv.style.display = 'none';
+    }
+
     // set position
     markerDiv.style.left = getPosition(marker) + '%';
     if (marker.duration) {
@@ -195,11 +201,7 @@ function registerVideoJsMarkersPlugin(options) {
     }    
   }
 
-  function createMarkerDiv(marker: Marker): ?Object {
-    var ratio = marker.time / player.duration();
-    if (ratio < 0 || ratio > 1) {
-      return null;
-    }
+  function createMarkerDiv(marker: Marker): Object {
 
     var markerDiv = videojs.createEl('div', {}, {
       'data-marker-key': marker.key,
@@ -433,7 +435,7 @@ function registerVideoJsMarkersPlugin(options) {
 
     // remove existing markers if already initialized
     player.markers.removeAll();
-    addMarkers(options.markers);
+    addMarkers(setting.markers);
 
     if (setting.breakOverlay.display) {
       initializeOverlay();