Skip to content

Commit

Permalink
Merge branch 'release/0.4.6' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jhonatangcavalcanti committed Oct 8, 2021
2 parents c2944b4 + 844ad99 commit a265da2
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 44 deletions.
62 changes: 43 additions & 19 deletions dist/clappr.js
Expand Up @@ -4308,6 +4308,8 @@
Events.CONTAINER_CONTEXTMENU = 'container:contextmenu';
Events.CONTAINER_MOUSE_ENTER = 'container:mouseenter';
Events.CONTAINER_MOUSE_LEAVE = 'container:mouseleave';
Events.CONTAINER_MOUSE_UP = 'container:mouseup';
Events.CONTAINER_MOUSE_DOWN = 'container:mousedown';
/**
* Fired when the container seeks the video
*
Expand Down Expand Up @@ -5069,7 +5071,9 @@
'touchend': 'dblTap',
'contextmenu': 'onContextMenu',
'mouseenter': 'mouseEnter',
'mouseleave': 'mouseLeave'
'mouseleave': 'mouseLeave',
'mouseup': 'onMouseUp',
'mousedown': 'onMouseDown'
};
}
/**
Expand Down Expand Up @@ -5564,6 +5568,16 @@
value: function mouseLeave() {
if (!this.options.chromeless || this.options.allowUserInteraction) this.trigger(Events.CONTAINER_MOUSE_LEAVE);
}
}, {
key: "mouseUp",
value: function mouseUp() {
if (!this.options.chromeless || this.options.allowUserInteraction) this.trigger(Events.CONTAINER_MOUSE_UP);
}
}, {
key: "mouseDown",
value: function mouseDown() {
if (!this.options.chromeless || this.options.allowUserInteraction) this.trigger(Events.CONTAINER_MOUSE_DOWN);
}
}, {
key: "settingsUpdate",
value: function settingsUpdate() {
Expand Down Expand Up @@ -6823,7 +6837,7 @@
plugins: {},
playbacks: []
};
var currentVersion = "0.4.18";
var currentVersion = "0.4.19";
return /*#__PURE__*/function () {
_createClass$2(Loader, null, [{
key: "checkVersionSupport",
Expand Down Expand Up @@ -7994,7 +8008,7 @@
key: "supportedVersion",
get: function get() {
return {
min: "0.4.18"
min: "0.4.19"
};
}
}, {
Expand Down Expand Up @@ -8565,20 +8579,30 @@
}, {
key: "getDuration",
value: function getDuration() {
var _this4 = this;

if (this.isLive) {
try {
if (this.el.seekable.length > 0) {
return this.el.seekable.end(0) - this.el.seekable.start(0);
} catch (e) {
setTimeout(function () {
return _this4._updateSettings();
}, 1000);
} else {
// `seekable` is not available; this is probably OK, but make sure we're
// updating the control bar to reflect it
this._scheduleUpdateSettingsCheck();
}
}

return this.el.duration;
}
}, {
key: "_scheduleUpdateSettingsCheck",
value: function _scheduleUpdateSettingsCheck() {
var _this4 = this;

if (this._updateSettingsCheckInFlight) return;
this._updateSettingsCheckInFlight = setTimeout(function () {
_this4._updateSettings();

_this4._updateSettingsCheckInFlight = null;
}, 1000);
}
}, {
key: "_onTimeUpdate",
value: function _onTimeUpdate() {
Expand Down Expand Up @@ -8805,7 +8829,7 @@
key: "supportedVersion",
get: function get() {
return {
min: "0.4.18"
min: "0.4.19"
};
}
}, {
Expand Down Expand Up @@ -8854,7 +8878,7 @@
key: "supportedVersion",
get: function get() {
return {
min: "0.4.18"
min: "0.4.19"
};
}
}, {
Expand Down Expand Up @@ -8940,7 +8964,7 @@
key: "supportedVersion",
get: function get() {
return {
min: "0.4.18"
min: "0.4.19"
};
}
}, {
Expand Down Expand Up @@ -9090,7 +9114,7 @@
key: "supportedVersion",
get: function get() {
return {
min: "0.4.18"
min: "0.4.19"
};
}
}]);
Expand Down Expand Up @@ -9247,7 +9271,7 @@
key: "supportedVersion",
get: function get() {
return {
min: "0.4.18"
min: "0.4.19"
};
}
}]);
Expand All @@ -9256,7 +9280,7 @@
}(CorePlugin);

// Copyright 2014 Globo.com Player authors. All rights reserved.
var version$1 = "0.4.18"; // Built-in Plugins/Playbacks
var version$1 = "0.4.19"; // Built-in Plugins/Playbacks

Loader.registerPlugin(Strings);
Loader.registerPlugin(SourcesPlugin);
Expand Down Expand Up @@ -12330,7 +12354,7 @@
WaterMark: WaterMarkPlugin
};

var version = "0.4.5";
var version = "0.4.6";

for (var _i = 0, _Object$values = Object.values(Plugins); _i < _Object$values.length; _i++) {
var plugin = _Object$values[_i];
Expand Down Expand Up @@ -19824,7 +19848,7 @@
/|#EXT-X-PROGRAM-DATE-TIME:(.+)/.source, // next segment's program date/time group 5 => the datetime spec
/|#.*/.source // All other non-segment oriented tags will match with all groups empty
].join(''), 'g');
var LEVEL_PLAYLIST_REGEX_SLOW = /(?:(?:#(EXTM3U))|(?:#EXT-X-(PLAYLIST-TYPE):(.+))|(?:#EXT-X-(MEDIA-SEQUENCE): *(\d+))|(?:#EXT-X-(TARGETDURATION): *(\d+))|(?:#EXT-X-(KEY):(.+))|(?:#EXT-X-(START):(.+))|(?:#EXT-X-(ENDLIST))|(?:#EXT-X-(DISCONTINUITY-SEQ)UENCE:(\d+))|(?:#EXT-X-(DIS)CONTINUITY))|(?:#EXT-X-("0.4.5"):(\d+))|(?:#EXT-X-(MAP):(.+))|(?:(#)([^:]*):(.*))|(?:(#)(.*))(?:.*)\r?\n?/;
var LEVEL_PLAYLIST_REGEX_SLOW = /(?:(?:#(EXTM3U))|(?:#EXT-X-(PLAYLIST-TYPE):(.+))|(?:#EXT-X-(MEDIA-SEQUENCE): *(\d+))|(?:#EXT-X-(TARGETDURATION): *(\d+))|(?:#EXT-X-(KEY):(.+))|(?:#EXT-X-(START):(.+))|(?:#EXT-X-(ENDLIST))|(?:#EXT-X-(DISCONTINUITY-SEQ)UENCE:(\d+))|(?:#EXT-X-(DIS)CONTINUITY))|(?:#EXT-X-("0.4.6"):(\d+))|(?:#EXT-X-(MAP):(.+))|(?:(#)([^:]*):(.*))|(?:(#)(.*))(?:.*)\r?\n?/;
var MP4_REGEX_SUFFIX = /\.(mp4|m4s|m4v|m4a)$/i;

var m3u8_parser_M3U8Parser = /*#__PURE__*/function () {
Expand Down Expand Up @@ -20076,7 +20100,7 @@
level.targetduration = parseFloat(value1);
break;

case '"0.4.5"':
case '"0.4.6"':
level.version = parseInt(value1);
break;

Expand Down
2 changes: 1 addition & 1 deletion dist/clappr.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/clappr.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/clappr.min.js.map

Large diffs are not rendered by default.

58 changes: 41 additions & 17 deletions dist/clappr.plainhtml5.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/clappr.plainhtml5.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/clappr.plainhtml5.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/clappr.plainhtml5.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "@clappr/player",
"version": "0.4.5",
"version": "0.4.6",
"description": "An extensible media player for the web",
"main": "dist/clappr.js",
"scripts": {
Expand Down

0 comments on commit a265da2

Please sign in to comment.