Merge branch 'master' into expose-is-vimeo-url

Author: fisherinnovation

README.md

@@ -54,6 +54,8 @@ You can use the library to make the embed for you. All you need is an empty
 element and the video id or vimeo.com url (and optional
 [embed options](#embed-options)).
 
+**NOTE:** If the video [privacy settings](https://vimeo.zendesk.com/hc/en-us/articles/224817847-Privacy-settings-overview) are "Private", you will need to provide the full video URL as a `url` property.
+
 ```html
 <div id="made-in-ny"></div>
 

dist/player.es.js

@@ -1,4 +1,4 @@
-/*! @vimeo/player v2.16.0 | (c) 2021 Vimeo | MIT License | https://github.com/vimeo/player.js */
+/*! @vimeo/player v2.16.1 | (c) 2021 Vimeo | MIT License | https://github.com/vimeo/player.js */
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -1247,7 +1247,7 @@ var Player = /*#__PURE__*/function () {
         return screenfull.exit();
       };
 
-      screenfull.on('fullscreenchange', function () {
+      this.fullscreenchangeHandler = function () {
         if (screenfull.isFullscreen) {
           storeCallback(_this, 'event:exitFullscreen', exitFullscreen);
         } else {
@@ -1258,7 +1258,9 @@ var Player = /*#__PURE__*/function () {
         _this.ready().then(function () {
           postMessage(_this, 'fullscreenchange', screenfull.isFullscreen);
         });
-      });
+      };
+
+      screenfull.on('fullscreenchange', this.fullscreenchangeHandler);
     }
 
     return this;
@@ -1755,6 +1757,10 @@ var Player = /*#__PURE__*/function () {
 
         _this5._window.removeEventListener('message', _this5._onMessage);
 
+        if (screenfull.isEnabled) {
+          screenfull.off('fullscreenchange', _this5.fullscreenchangeHandler);
+        }
+
         resolve();
       });
     }

dist/player.js

@@ -1,6 +1,6 @@
 {
   "name": "@vimeo/player",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "description": "Interact with and control an embedded Vimeo Player.",
   "license": "MIT",
   "author": "Vimeo <https://vimeo.com>",

dist/player.js.map

@@ -131,8 +131,7 @@ class Player {
 
         if (screenfull.isEnabled) {
             const exitFullscreen = () => screenfull.exit();
-
-            screenfull.on('fullscreenchange', () => {
+            this.fullscreenchangeHandler = () => {
                 if (screenfull.isFullscreen) {
                     storeCallback(this, 'event:exitFullscreen', exitFullscreen);
                 }
@@ -143,7 +142,9 @@ class Player {
                 this.ready().then(() => {
                     postMessage(this, 'fullscreenchange', screenfull.isFullscreen);
                 });
-            });
+            };
+
+            screenfull.on('fullscreenchange', this.fullscreenchangeHandler);
         }
 
         return this;
@@ -551,7 +552,8 @@ class Player {
                 // If not, just remove the iframe element.
                 if (this.element.parentNode.parentNode && this._originalElement && this._originalElement !== this.element.parentNode) {
                     this.element.parentNode.parentNode.removeChild(this.element.parentNode);
-                } else {
+                }
+                else {
                     this.element.parentNode.removeChild(this.element);
                 }
             }
@@ -566,14 +568,19 @@ class Player {
                     // If not, just remove the iframe element.
                     if (iframe.parentNode.parentNode && this._originalElement && this._originalElement !== iframe.parentNode) {
                         iframe.parentNode.parentNode.removeChild(iframe.parentNode);
-                    } else {
+                    }
+                    else {
                         iframe.parentNode.removeChild(iframe);
                     }
                 }
             }
 
             this._window.removeEventListener('message', this._onMessage);
 
+            if (screenfull.isEnabled) {
+                screenfull.off('fullscreenchange', this.fullscreenchangeHandler);
+            }
+
             resolve();
         });
     }

dist/player.min.js

@@ -3,18 +3,18 @@ import html from './helpers/html';
 import { getOEmbedParameters, getOEmbedData, createEmbed, initializeEmbeds, resizeEmbeds } from '../src/lib/embed';
 
 test('getOEmbedParameters retrieves the params from data attributes', (t) => {
-    const el = html`<div data-vimeo-id="2" data-vimeo-width="640" data-vimeo-autoplay></div>`;
+    const el = html`<div data-vimeo-id="336812660" data-vimeo-width="640" data-vimeo-autoplay></div>`;
     t.deepEqual(getOEmbedParameters(el), {
-        id: '2',
+        id: '336812660',
         width: '640',
         autoplay: 1
     });
 });
 
 test('getOEmbedParameters builds off of a defaults object', (t) => {
-    const el = html`<div data-vimeo-id="2" data-vimeo-width="640" data-vimeo-autoplay></div>`;
+    const el = html`<div data-vimeo-id="336812660" data-vimeo-width="640" data-vimeo-autoplay></div>`;
     t.deepEqual(getOEmbedParameters(el, { loop: true }), {
-        id: '2',
+        id: '336812660',
         width: '640',
         autoplay: 1,
         loop: true
@@ -41,27 +41,27 @@ test('createEmbed should throw if there’s no element', (t) => {
 
 test('createEmbed returns the already-initialized iframe', (t) => {
     const container = html`<div data-vimeo-initialized></div>`;
-    const iframe = html`<iframe src="https://player.vimeo.com/2"></iframe>`;
+    const iframe = html`<iframe src="https://player.vimeo.com/336812660"></iframe>`;
     container.appendChild(iframe);
     t.deepEqual(createEmbed({ html: 'html' }, container), iframe);
 });
 
 test('createEmbed makes an iframe from the oembed data', (t) => {
     const container = html`<div></div>`;
-    const markup = '<iframe src="https://player.vimeo.com/2"></iframe>';
+    const markup = '<iframe src="https://player.vimeo.com/336812660"></iframe>';
 
     const embed = createEmbed({ html: markup }, container);
     t.true(container.getAttribute('data-vimeo-initialized') === 'true');
-    t.deepEqual(embed.outerHTML, html`<iframe src="https://player.vimeo.com/2"></iframe>`.outerHTML);
+    t.deepEqual(embed.outerHTML, html`<iframe src="https://player.vimeo.com/336812660"></iframe>`.outerHTML);
 });
 
 test('createEmbed returns the iframe from a responsive embed', (t) => {
     const container = html`<div></div>`;
-    const markup = '<div style="position:relative;padding-bottom:42.5%;height:0"><iframe src="https://player.vimeo.com/video/2" style="position:absolute;top:0;left:0;width:100%;height:100%" frameborder="0"></iframe></div>';
+    const markup = '<div style="position:relative;padding-bottom:42.5%;height:0"><iframe src="https://player.vimeo.com/video/336812660" style="position:absolute;top:0;left:0;width:100%;height:100%" frameborder="0"></iframe></div>';
 
     const embed = createEmbed({ html: markup }, container);
     t.true(container.getAttribute('data-vimeo-initialized') === 'true');
-    t.deepEqual(embed.outerHTML, html`<iframe src="https://player.vimeo.com/video/2" style="position:absolute;top:0;left:0;width:100%;height:100%" frameborder="0"></iframe>`.outerHTML);
+    t.deepEqual(embed.outerHTML, html`<iframe src="https://player.vimeo.com/video/336812660" style="position:absolute;top:0;left:0;width:100%;height:100%" frameborder="0"></iframe>`.outerHTML);
 });
 
 test('initializeEmbeds should create embeds', async (t) => {

dist/player.min.js.map

@@ -45,17 +45,17 @@ test('isVimeoUrl identifies *.vimeo.com only', (t) => {
     t.true(isVimeoUrl('https://notvimeo.com') === false);
     t.true(isVimeoUrl('https://vimeo.someone.com') === false);
     t.true(isVimeoUrl('https://player.vimeo.com/video/123') === true);
-    t.true(isVimeoUrl('https://vimeo.com/2') === true);
+    t.true(isVimeoUrl('https://vimeo.com/336812660') === true);
     t.true(isVimeoUrl('https://vimeo.com.evil.net') === false);
     t.true(isVimeoUrl('http://player.vimeo.com.evil.com') === false);
     t.true(isVimeoUrl('https://player.vimeozcom') === false);
     t.true(isVimeoUrl('https://www2vimeo.com') === false);
 });
 
 test('getVimeoUrl correctly returns a url from the embed parameters', (t) => {
-    t.true(getVimeoUrl({ id: 2 }) === 'https://vimeo.com/2');
-    t.true(getVimeoUrl({ url: 'http://vimeo.com/2' }) === 'https://vimeo.com/2');
-    t.true(getVimeoUrl({ url: 'https://vimeo.com/2' }) === 'https://vimeo.com/2');
+    t.true(getVimeoUrl({ id: 336812660 }) === 'https://vimeo.com/336812660');
+    t.true(getVimeoUrl({ url: 'http://vimeo.com/336812660' }) === 'https://vimeo.com/336812660');
+    t.true(getVimeoUrl({ url: 'https://vimeo.com/336812660' }) === 'https://vimeo.com/336812660');
 
 });
 

package.json

@@ -2,9 +2,9 @@
 import { JSDOM } from 'jsdom';
 
 const html = `<body>
-	<div id="test_player" data-vimeo-id="2"></div>
+	<div id="test_player" data-vimeo-id="336812660"></div>
 	<div class="multiple">
-		<iframe class="two" src="https://player.vimeo.com/video/2"></iframe>
+		<iframe class="two" src="https://player.vimeo.com/video/336812660"></iframe>
 		<iframe class="one" src="https://player.vimeo.com/video/76979871"></iframe>
 	</div>
 </body>`;