bump to 0.2.86

clappr · Jan 17, 2018 · 1994866 · 1994866
1 parent fdba49c
commit 1994866
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "clappr",
   "description": "An extensible media player for the web",
-  "version": "0.2.85",
+  "version": "0.2.86",
   "homepage": "https://github.com/clappr/clappr",
   "authors": [
     "Globo.com"

diff --git a/dist/clappr.js b/dist/clappr.js
@@ -6546,7 +6546,7 @@ var _clapprZepto2 = _interopRequireDefault(_clapprZepto);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var version = "0.2.85"; // Copyright 2014 Globo.com Player authors. All rights reserved.
+var version = "0.2.86"; // 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.
 
@@ -6853,7 +6853,7 @@ var Player = function (_BaseObject) {
       // if user iteraction is not allowed ensure keyboard shortcuts are disabled
       _this.options.disableKeyboardShortcuts = true;
     }
-    _this._registerOptionEventListeners();
+    _this._registerOptionEventListeners(_this.options.events);
     _this._coreFactory = new _core_factory2.default(_this);
     _this.playerInfo = _player_info2.default.getInstance(_this.options.playerId);
     _this.playerInfo.currentSize = { width: options.width, height: options.height };
@@ -6920,8 +6920,8 @@ var Player = function (_BaseObject) {
   Player.prototype._registerOptionEventListeners = function _registerOptionEventListeners() {
     var _this2 = this;
 
-    var events = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var newEvents = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var newEvents = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var events = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
     (0, _keys2.default)(events).forEach(function (userEvent) {
       var eventType = _this2.eventsMapping[userEvent];
@@ -7211,7 +7211,7 @@ var Player = function (_BaseObject) {
   Player.prototype.configure = function configure() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-    this._registerOptionEventListeners(this.options.events, options.events);
+    this._registerOptionEventListeners(options.events, this.options.events);
     this.core.configure(options);
     return this;
   };

diff --git a/dist/clappr.js.map b/dist/clappr.js.map
diff --git a/dist/clappr.min.js b/dist/clappr.min.js
diff --git a/dist/clappr.min.js.map b/dist/clappr.min.js.map
diff --git a/dist/clappr.plainhtml5.js b/dist/clappr.plainhtml5.js
diff --git a/dist/clappr.plainhtml5.js.map b/dist/clappr.plainhtml5.js.map
diff --git a/dist/clappr.plainhtml5.min.js b/dist/clappr.plainhtml5.min.js
diff --git a/dist/clappr.plainhtml5.min.js.map b/dist/clappr.plainhtml5.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clappr",
-  "version": "0.2.85",
+  "version": "0.2.86",
   "description": "An extensible media player for the web",
   "main": "./dist/clappr.js",
   "scripts": {