Skip to content

Commit

Permalink
bump to 0.2.84
Browse files Browse the repository at this point in the history
  • Loading branch information
towerz committed Jan 11, 2018
1 parent a1134bc commit db59d1c
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 40 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,7 +1,7 @@
{
"name": "clappr",
"description": "An extensible media player for the web",
"version": "0.2.83",
"version": "0.2.84",
"homepage": "https://github.com/clappr/clappr",
"authors": [
"Globo.com"
Expand Down
35 changes: 19 additions & 16 deletions dist/clappr.js
Expand Up @@ -6546,7 +6546,7 @@ var _clapprZepto2 = _interopRequireDefault(_clapprZepto);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var version = "0.2.83"; // Copyright 2014 Globo.com Player authors. All rights reserved.
var version = "0.2.84"; // Copyright 2014 Globo.com Player authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

Expand Down Expand Up @@ -6920,11 +6920,18 @@ var Player = function (_BaseObject) {
Player.prototype._registerOptionEventListeners = function _registerOptionEventListeners() {
var _this2 = this;

var userEvents = this.options.events || {};
(0, _keys2.default)(userEvents).forEach(function (userEvent) {
var events = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var newEvents = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

(0, _keys2.default)(events).forEach(function (userEvent) {
var eventType = _this2.eventsMapping[userEvent];
eventType && _this2.off(eventType);
});

(0, _keys2.default)(newEvents).forEach(function (userEvent) {
var eventType = _this2.eventsMapping[userEvent];
if (eventType) {
var eventFunction = userEvents[userEvent];
var eventFunction = newEvents[userEvent];
eventFunction = typeof eventFunction === 'function' && eventFunction;
eventFunction && _this2.on(eventType, eventFunction);
}
Expand Down Expand Up @@ -7201,7 +7208,10 @@ var Player = function (_BaseObject) {
*/


Player.prototype.configure = function configure(options) {
Player.prototype.configure = function configure() {
var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

this._registerOptionEventListeners(this.options.events, options.events);
this.core.configure(options);
return this;
};
Expand Down Expand Up @@ -8951,7 +8961,9 @@ var Core = function (_UIObject) {
this.mediaControl.container = null;
this.containerFactory.options = _clapprZepto2.default.extend(this.options, { sources: sources });
this.containerFactory.createContainers().then(function (containers) {
_this5.setupContainers(containers);
return _this5.setupContainers(containers);
}).then(function (containers) {
return _this5.resolveOnContainersReady(containers);
});
};

Expand Down Expand Up @@ -30534,7 +30546,6 @@ var NoOp = function (_Playback) {
var _this = (0, _possibleConstructorReturn3.default)(this, _Playback.call.apply(_Playback, [this].concat(args)));

_this._noiseFrameNum = -1;
_this._started = false;
return _this;
}

Expand All @@ -30543,19 +30554,11 @@ var NoOp = function (_Playback) {
this.$el.html(this.template({ message: playbackNotSupported }));
this.trigger(_events2.default.PLAYBACK_READY, this.name);
var showForNoOp = !!(this.options.poster && this.options.poster.showForNoOp);
if (this.options.autoPlay || !showForNoOp) this.play();
if (this.options.autoPlay || !showForNoOp) this._animate();

return this;
};

NoOp.prototype.play = function play() {
if (!this._started) {
this._started = true;
this.trigger(_events2.default.PLAYBACK_PLAY);
this._animate();
}
};

NoOp.prototype._noise = function _noise() {
this._noiseFrameNum = (this._noiseFrameNum + 1) % 5;
if (this._noiseFrameNum) {
Expand Down
2 changes: 1 addition & 1 deletion dist/clappr.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion 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.

35 changes: 19 additions & 16 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",
"version": "0.2.83",
"version": "0.2.84",
"description": "An extensible media player for the web",
"main": "./dist/clappr.js",
"scripts": {
Expand Down

0 comments on commit db59d1c

Please sign in to comment.