merge branch 'release/0.3.7'

.hound.yml

@@ -1,3 +1,3 @@
-java_script:
+eslint:
   enabled: true
-  config_file: .eslintrc.js
+  config_file: .eslintrc

.travis.yml

@@ -2,10 +2,10 @@ language: node_js
 sudo: false
 node_js: "10"
 cache: yarn
+dist: xenial
 
-before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+services:
+  - xvfb
 
 addons:
   chrome: "stable"

CONTRIBUTORS

@@ -10,37 +10,87 @@
 #
 # Please keep this file sorted, and group users with multiple emails.
 
+Ahmad Mayahi <ahmad.mayahi@gmail.com>
 Alvyn McQuitty <alvynmcq@gmail.com>
+Andrey Filimonow <andrefilimono@gmail.com>
 Andrey Nikitin <andrey.d.nikitin@gmail.com>
+Andrey Polischuk <me@andrepolischuk.com>
+Andriy Lysnevych <andriy.lysnevych@gmail.com>
 Ari Selseng <ari@selseng.net>
+Ben <benjaminjbaum@gmail.com>
 Bernardo Camilo <me@bernardocamilo.com>
 Bruno Torres <me@brunotorr.es>
 Celio Latorraca <celio.la@gmail.com>
-derrod <xlnedder@gmail.com>
-Felipe Victor (Baiano) <felipevictor13@gmail.com>
+Chris Wiggins <chris@wiggins.nz>
+Daniel Afonso <daniel.acfilho@gmail.com>
+David Beitey <david@davidjb.com>
+Denis Sikuler <progwork@yandex.com>
+Diego.Péres <speres.diego@gmail.com>
+Eddie Lau 3dd13 <tatonlto@gmail.com>
+EmileP <36151637+emilepommier@users.noreply.github.com>
+Emre Karataşoğlu <Lethea@windowslive.com>
 Flávio Ribeiro <email@flavioribeiro.com>
+Guilherme <skrater@gmail.com>
 Guilherme Heynemann Bruzzi <guibruzzi@gmail.com>
+Guilherme Medeiros <eu@guilhermemedeiros.com.br>
 Gustavo Barbosa <gustavocsb@gmail.com>
-Karina Sirqueira <sirqueira.karina@gmail.com>
 Henrik Lundgren <henrik.lundgren@boffins.se>
+Henrique Breim <breim@protonmail.ch>
 Iulian Onofrei <revolter@users.noreply.github.com>
+Jamie Stackhouse <jamie.stackhouse@ingest.io>
+Jarom McDonald <jlmcdonald@gmail.com>
+Jedidiah Hurt <jed.hurt@gmail.com>
 Jeff Fairley <jfairley@gmail.com>
+Jenna Smith <jenna.olivia.smith@gmail.com>
+Jhonatan Gomes <jhonatan.gomes93@gmail.com>
+João Paulo da Silva Vieira <vieira.joaopaulo@hotmail.com>
+Jussi Keranen <jussike@gmail.com>
 Jérôme DENIS <jerome.denis@e-wi.fr>
+Karim Slimani <karim@playmedia.fr>
 Ke Xu <markxu18@gmail.com>
 Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
 Leonardo <leo@leocardz.com>
 Lewis Cowper <lewis.cowper@wandisco.com>
+Loris Mancel <lm@taktik.com>
+Lucas Costa <lucasrodcosta@gmail.com>
+Marcel <MTRNord@users.noreply.github.com>
+Mark Allen Matney, Jr <mmatney@library.ucla.edu>
+Martin Kolárik <martin@kolarik.sk>
 Maxwell Dayvson da Silva <dayvson@gmail.com>
+Michael Cunningham <michael.cunningham@live.ca>
 Mike Griffith <bikegriffith@gmail.com>
+Nicholas Asimov <nicholas@asimov.me>
+Niko78 <nicolas.vanhaute@gmail.com>
+Ogün Karakuş <kirk5bucuk@gmail.com>
 Quentin V <valmori@gutenberg-technology.com>
-rheber <rheber@rediffmail.com>
+Raphael Amorim <rapha850@gmail.com>
 Robert Nagy <robert.nagy@boffins.se>
 Rodrigo Machado <rcmachado@gmail.com>
+Roland Starke <rolandstarke@users.noreply.github.com>
+RussCoder <RussCoder@yandex.ru>
 Sander Van Schoote <vanschoote.sander@gmail.com>
 Sean Hussey <sean@seanhussey.com>
-Shahar Mor <shahar@peer5.com>
+Sergey Chooh <chooh@chooh.msk.ru>
+Setsusan <sdev@scryptmail.com>
 Stanislav Gurnik <sgurnik@gmail.com>
+Stanley Gurnik <sgurnik@gmail.com>
+Stephan Hesse <tchakabam@gmail.com>
+Steven Lu <tacticalazn@gmail.com>
 Thiago Pontes <thiagopnts@gmail.com>
 Tom Jenkinson <tjcode@outlook.com>
-Vincent Hounshell <hounvs@gmail.com>
+Tomasz Rybarczyk <paluho@gmail.com>
+Vadim Anufriev <v.anufriev@cdnvideo.ru>
+Vagner Santana <vagnervjs@gmail.com>
 Vlad V. Teteria <vlad@server-labs.ua>
+Wahaj Dar <wahajdar@outlook.com>
+argoilves <argoilves@gmail.com>
+derrod <xlnedder@gmail.com>
+hounvs <hounvs@gmail.com>
+hxl-dy <hexulei@dyinnovations.com>
+kolpax <kolpax@gmail.com>
+nixx <nixx.dj@gmail.com>
+otmjka <nindeec@gmail.com>
+rheber <rheber@rediffmail.com>
+shaharmor <shahar@peer5.com>
+tchakabam <tchakabam@gmail.com>
+thiagopnts <thiagopnts@gmail.com>

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "clappr",
   "description": "An extensible media player for the web",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "homepage": "https://github.com/clappr/clappr",
   "authors": [
     "Globo.com"

dist/clappr.js

@@ -30386,7 +30386,7 @@ var _clapprZepto2 = _interopRequireDefault(_clapprZepto);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var version = "0.3.6"; // Copyright 2014 Globo.com Player authors. All rights reserved.
+var version = "0.3.7"; // 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.
 
@@ -36710,12 +36710,15 @@ var PosterPlugin = function (_UIContainerPlugin) {
   };
 
   PosterPlugin.prototype.clicked = function clicked() {
-    if (!this.options.chromeless || this.options.allowUserInteraction) {
-      this.playRequested = true;
-      this.update();
-      this.container.play();
+    // Let "click_to_pause" plugin handle click event if media has started playing
+    if (!this.hasStartedPlaying) {
+      if (!this.options.chromeless || this.options.allowUserInteraction) {
+        this.playRequested = true;
+        this.update();
+        this.container.play();
+      }
+      return false;
     }
-    return false;
   };
 
   PosterPlugin.prototype.shouldHideOnPlay = function shouldHideOnPlay() {

doc/BUILTIN_PLUGINS.md

@@ -81,7 +81,7 @@ The configuration for the playback, it's still only compatible with `html5_video
     controls: true,
     playInline: true, // allows inline playback when running on iOS UIWebview
     crossOrigin: 'use-credentials',
-    recycleVideo: Clappr.Browser.isMobile, // Recycle <video> element only for mobile. (default is false)
+    recycleVideo: Clappr.Browser.isMobile, // Recycle <video> element only for mobile. (default is true)
     triggerFatalErrorOnResourceDenied: true, // Triggers playback fatal error if resource is denied. (default is false)
     externalTracks: [ // Add external <track> (if supported by browser, see also https://www.w3.org/TR/html5/embedded-content-0.html#the-track-element)
       {lang: 'en', label: 'English', src: 'http://example.com/en.vtt', kind: 'subtitles'},

karma.conf.js

@@ -5,6 +5,7 @@ const webpackConfig = require('./webpack.config.base')
 
 // add subject as webpack's postloader
 const webpackTestConfig = webpackConfig({
+  mode: 'development',
   rules: [
     {
       test: /\.js$/,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clappr",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "An extensible media player for the web",
   "main": "./dist/clappr.js",
   "scripts": {

src/plugins/poster/poster.js

@@ -95,12 +95,15 @@ export default class PosterPlugin extends UIContainerPlugin {
   }
 
   clicked() {
-    if (!this.options.chromeless || this.options.allowUserInteraction) {
-      this.playRequested = true
-      this.update()
-      this.container.play()
+    // Let "click_to_pause" plugin handle click event if media has started playing
+    if (! this.hasStartedPlaying) {
+      if (!this.options.chromeless || this.options.allowUserInteraction) {
+        this.playRequested = true
+        this.update()
+        this.container.play()
+      }
+      return false
     }
-    return false
   }
 
   shouldHideOnPlay() {

yarn.lock

@@ -933,9 +933,9 @@ asynckit@^0.4.0:
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
-  integrity sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^6.3.1:
   version "6.7.7"
@@ -1822,7 +1822,7 @@ boom@5.x.x:
 
 bower-store@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npmjs.org/bower-store/-/bower-store-0.1.0.tgz#39dbd4aa01ed4456c862255e227ee105a4d44adf"
+  resolved "https://registry.npmjs.org/bower-store/-/bower-store-0.1.0.tgz#39dbd4aa01ed4456c862255e227ee105a4d44adf"
   integrity sha1-OdvUqgHtRFbIYiVeIn7hBaTUSt8=
   dependencies:
     cache-base "^0.8.2"
@@ -2187,9 +2187,9 @@ cache-base@^1.0.1:
     unset-value "^1.0.0"
 
 cached-path-relative@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
-  integrity sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db"
+  integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==
 
 caller-path@^0.1.0:
   version "0.1.0"
@@ -4079,15 +4079,10 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
-
-extend@^3.0.0, extend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
-  integrity sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ=
+extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^2.0.4:
   version "2.0.4"
@@ -4511,7 +4506,7 @@ fs-access@^1.0.0:
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  resolved "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
   integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=
 
 fs-minipass@^1.2.5:
@@ -6763,9 +6758,9 @@ lodash.memoize@~3.0.3:
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
 lodash.mergewith@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
-  integrity sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
+  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
 lodash.pairs@^3.0.0:
   version "3.0.1"
@@ -6944,9 +6939,9 @@ loud-rejection@^1.0.0:
     signal-exit "^3.0.0"
 
 lower-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.3.tgz#c92393d976793eee5ba4edb583cf8eae35bd9bfb"
-  integrity sha1-ySOT2XZ5Pu5bpO21g8+OrjW9m/s=
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
 lru-cache@2:
   version "2.2.4"
@@ -7405,12 +7400,12 @@ mississippi@^3.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.1.3, mixin-deep@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.2.0.tgz#d02b8c6f8b6d4b8f5982d3fd009c4919851c3fe2"
-  integrity sha1-0CuMb4ttS49ZgtP9AJxJGYUcP+I=
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
-    is-extendable "^0.1.1"
+    is-extendable "^1.0.1"
 
 mixin-object@^2.0.1:
   version "2.0.1"
@@ -7627,9 +7622,9 @@ nise@^1.2.0:
     text-encoding "^0.6.4"
 
 no-case@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
-  integrity sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
   dependencies:
     lower-case "^1.1.1"
 
@@ -9458,7 +9453,7 @@ regenerator-transform@^0.10.0:
 
 regex-cache@^0.4.2:
   version "0.4.3"
-  resolved "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  resolved "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
   integrity sha1-mxpsNdTQ3871cRrmUejp09cRQUU=
   dependencies:
     is-equal-shallow "^0.1.3"
@@ -11281,7 +11276,7 @@ umd@^3.0.0:
 
 unc-path-regex@^0.1.0:
   version "0.1.2"
-  resolved "http://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
 underscore@~1.7.0: