cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VideoOverlay accept VideoElement (#5661)

Browse Source 
* VideoOverlay accept VideoElement

Added the ability to pass an existing element, to support better integration with other libraries such as DashJS, and more customability in general.
Also, fixed some wrong documentation regarding VideoOverlay.

* Fix typo
This commit is contained in:
Eyal Avidan 2017-07-30 01:14:45 +03:00 committed by Per Liedman
parent b675753422
commit 0d36e46dc6
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/layer/VideoOverlay.js
View File

@ -16,8 +16,8 @@ import * as Util from '../core/Util';
*
* ```js
* var videoUrl = 'https://www.mapbox.com/bites/00188/patricia_nasa.webm',
* imageBounds = [[ 32, -130], [ 13, -100]];
* L.imageOverlay(imageUrl, imageBounds).addTo(map);
* videoBounds = [[ 32, -130], [ 13, -100]];
* L.VideoOverlay(videoUrl, videoBounds ).addTo(map);
* ```
*/
@ -36,8 +36,11 @@ export var VideoOverlay = ImageOverlay.extend({
},
_initImage: function () {
var vid = this._image = DomUtil.create('video',
'leaflet-image-layer ' + (this._zoomAnimated ? 'leaflet-zoom-animated' : ''));
var wasElementSupplied = this._url.tagName === 'VIDEO';
var vid = this._image = wasElementSupplied ? this._url : DomUtil.create('video');
vid.class = vid.class || '';
vid.class += 'leaflet-image-layer ' + (this._zoomAnimated ? 'leaflet-zoom-animated' : '');
vid.onselectstart = Util.falseFn;
vid.onmousemove = Util.falseFn;
@ -46,6 +49,8 @@ export var VideoOverlay = ImageOverlay.extend({
// Fired when the video has finished loading the first frame
vid.onloadeddata = Util.bind(this.fire, this, 'load');
if (wasElementSupplied) { return; }
if (!Util.isArray(this._url)) { this._url = [this._url]; }
vid.autoplay = !!this.options.autoplay;
@ -63,9 +68,10 @@ export var VideoOverlay = ImageOverlay.extend({
});
// @factory L.videoOverlay(videoUrl: String|Array, bounds: LatLngBounds, options?: VideoOverlay options)
// Instantiates an image overlay object given the URL of the video (or array of URLs) and the
// @factory L.videoOverlay(video: String|Array|HTMLVideoElement, bounds: LatLngBounds, options?: VideoOverlay options)
// Instantiates an image overlay object given the URL of the video (or array of URLs, or even a video element) and the
// geographical bounds it is tied to.
export function videoOverlay(url, bounds, options) {
return new VideoOverlay(url, bounds, options);
export function videoOverlay(video, bounds, options) {
return new VideoOverlay(video, bounds, options);
}