@clappr/core
Advanced tools
Comparing version 0.4.16 to 0.4.17
{ | ||
"name": "@clappr/core", | ||
"version": "0.4.16", | ||
"version": "0.4.17", | ||
"description": "Core components of the extensible media player for the web", | ||
@@ -39,31 +39,31 @@ "main": "./dist/clappr-core.js", | ||
"devDependencies": { | ||
"@babel/core": "^7.10.5", | ||
"@babel/preset-env": "^7.10.4", | ||
"@babel/core": "^7.12.10", | ||
"@babel/preset-env": "^7.12.11", | ||
"@rollup/plugin-alias": "^3.1.1", | ||
"@rollup/plugin-babel": "^5.1.0", | ||
"@rollup/plugin-commonjs": "^14.0.0", | ||
"@rollup/plugin-babel": "^5.2.2", | ||
"@rollup/plugin-commonjs": "^17.0.0", | ||
"@rollup/plugin-json": "^4.1.0", | ||
"@rollup/plugin-node-resolve": "^8.4.0", | ||
"@rollup/plugin-replace": "^2.3.3", | ||
"autoprefixer": "^9.8.5", | ||
"babel-jest": "^26.1.0", | ||
"@rollup/plugin-node-resolve": "^11.0.1", | ||
"@rollup/plugin-replace": "^2.3.4", | ||
"autoprefixer": "9.8.6", | ||
"babel-jest": "^26.6.3", | ||
"clappr-zepto": "0.0.7", | ||
"coveralls": "^3.1.0", | ||
"cz-conventional-changelog": "^3.2.0", | ||
"eslint": "^7.4.0", | ||
"cz-conventional-changelog": "^3.3.0", | ||
"eslint": "^7.17.0", | ||
"html-loader": "0.5.5", | ||
"jest": "^26.1.0", | ||
"jest": "^26.6.3", | ||
"jest-directory-named-resolver": "^0.3.0", | ||
"jest-mock-console": "^1.0.1", | ||
"node-sass": "^4.14.1", | ||
"rollup": "^2.22.0", | ||
"rollup-plugin-filesize": "^9.0.2", | ||
"node-sass": "^5.0.0", | ||
"rollup": "^2.36.1", | ||
"rollup-plugin-filesize": "^9.1.0", | ||
"rollup-plugin-html": "^0.2.1", | ||
"rollup-plugin-livereload": "^1.3.0", | ||
"rollup-plugin-livereload": "^2.0.0", | ||
"rollup-plugin-named-directory": "^1.0.0", | ||
"rollup-plugin-postcss": "^3.1.3", | ||
"rollup-plugin-serve": "^1.0.2", | ||
"rollup-plugin-sizes": "^1.0.1", | ||
"rollup-plugin-terser": "^6.1.0", | ||
"rollup-plugin-visualizer": "^4.0.4" | ||
"rollup-plugin-postcss": "^4.0.0", | ||
"rollup-plugin-serve": "^1.1.0", | ||
"rollup-plugin-sizes": "^1.0.3", | ||
"rollup-plugin-terser": "^7.0.2", | ||
"rollup-plugin-visualizer": "^4.2.0" | ||
}, | ||
@@ -70,0 +70,0 @@ "config": { |
@@ -227,3 +227,3 @@ import { extend } from '@/utils' | ||
configure(options) { | ||
this._options = $.extend(this._options, options) | ||
this._options = $.extend(true, this._options, options) | ||
} | ||
@@ -230,0 +230,0 @@ |
@@ -193,3 +193,3 @@ // Copyright 2014 Globo.com Player authors. All rights reserved. | ||
if (!this.el) { | ||
const attrs = $.extend({}, this.attributes) | ||
const attrs = $.extend(true, {}, this.attributes) | ||
if (this.id) attrs.id = this.id | ||
@@ -196,0 +196,0 @@ if (this.className) attrs['class'] = this.className |
@@ -125,3 +125,3 @@ // Copyright 2014 Globo.com Player authors. All rights reserved. | ||
this.playerError = playerError | ||
this.settings = $.extend({}, this.playback.settings) | ||
this.settings = $.extend(true, {}, this.playback.settings) | ||
this.isReady = false | ||
@@ -514,3 +514,3 @@ this.mediaControlDisabled = false | ||
configure(options) { | ||
this._options = $.extend(this._options, options) | ||
this._options = $.extend(true, this._options, options) | ||
this.updateStyle() | ||
@@ -517,0 +517,0 @@ this.playback.configure(this.options) |
@@ -223,3 +223,3 @@ // Copyright 2014 Globo.com Player authors. All rights reserved. | ||
this.containers.forEach((container) => container.destroy()) | ||
this.containerFactory.options = $.extend(this.options, { sources }) | ||
this.containerFactory.options = $.extend(true, this.options, { sources }) | ||
this.prepareContainers() | ||
@@ -353,3 +353,3 @@ } | ||
configure(options) { | ||
this._options = $.extend(this._options, options) | ||
this._options = $.extend(true, this._options, options) | ||
this.configureDomRecycler() | ||
@@ -356,0 +356,0 @@ |
@@ -242,3 +242,3 @@ // Copyright 2014 Globo.com Player authors. All rights reserved. | ||
} | ||
this._options = $.extend(defaultOptions, options) | ||
this._options = $.extend(true, defaultOptions, options) | ||
this.options.sources = this._normalizeSources(options) | ||
@@ -245,0 +245,0 @@ if (!this.options.chromeless) { |
@@ -142,3 +142,3 @@ // Copyright 2014 Globo.com Player authors. All rights reserved. | ||
$.extend(this.el, { | ||
$.extend(true, this.el, { | ||
muted: this.options.mute, | ||
@@ -278,3 +278,3 @@ defaultMuted: this.options.mute, | ||
consent(cb) { | ||
if (this.isPlaying()) { | ||
if (this.isPlaying() || this.el._consented) { | ||
super.consent(cb) | ||
@@ -285,2 +285,3 @@ } else { | ||
this.el.removeEventListener('error', eventHandler, false) | ||
this.el._consented = true // Flag to call load() only once | ||
super.consent(cb) | ||
@@ -287,0 +288,0 @@ } |
@@ -292,3 +292,3 @@ // Copyright 2014 Globo.com Player authors. All rights reserved. | ||
static configure(options) { | ||
this.options = $.extend(this.options, options) | ||
this.options = $.extend(true, this.options, options) | ||
} | ||
@@ -295,0 +295,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
1888512
25589