diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx index b6a0fb3f510eefa6e26c7d40b0ff82443c54427b..c6dc9647a375a25308862af2b1e680042ba23f74 100644 --- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx @@ -1,7 +1,6 @@ import React, { Component } from 'react'; import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrapper/component'; import YouTube from 'react-youtube'; -import Vimeo from 'react-vimeo'; import { sendMessage, onMessage } from './service'; const { PlayerState } = YouTube; diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx index 0d0c2c161995dfb8cb3894bcb1da2911ff00b6cb..4c6d706a5efb26365941640f9dc3703f87a8c8bb 100644 --- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx @@ -61,7 +61,7 @@ class ExternalVideoModal extends Component { const { startWatching, closeModal } = this.props; const { url } = this.state; - startWatching(url); + startWatching(url.trim()); closeModal(); } diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/service.js b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js index eee1ec82d5ed910189932de103aba487277e3c90..30d17ea1b9dac54a6784a072ec733758f60edeb5 100644 --- a/bigbluebutton-html5/imports/ui/components/external-video-player/service.js +++ b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js @@ -17,9 +17,9 @@ const getUrlFromVideoId = id => (id ? `${YOUTUBE_PREFIX}${id}` : ''); // https://stackoverflow.com/questions/3452546/how-do-i-get-the-youtube-video-id-from-a-url const videoIdFromUrl = (url) => { - const regExp = /.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=)([^#\&\?]*).*/; + const regExp = /.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=)([^#]*).*/; const match = url.match(regExp); - return (match && match[1].length == 11) ? match[1] : false; + return (match && match[1].length === 11) ? match[1] : false; }; const startWatching = (url) => { diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json index 5d73329e6db9b23d8ad868cef5acb77f148859e9..cd1638b818dc76361b74d516c4aad4b176ad78e3 100644 --- a/bigbluebutton-html5/package-lock.json +++ b/bigbluebutton-html5/package-lock.json @@ -3309,14 +3309,6 @@ "graceful-fs": "^4.1.6" } }, - "jsonp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz", - "integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=", - "requires": { - "debug": "^2.1.3" - } - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -3349,11 +3341,6 @@ "xmlbuilder": "^10.0.0" } }, - "keymirror": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/keymirror/-/keymirror-0.1.1.tgz", - "integrity": "sha1-kYiJ6hP40KQufFVyUO7nE63JXDU=" - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -5508,16 +5495,6 @@ } } }, - "react-vimeo": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/react-vimeo/-/react-vimeo-2.0.0.tgz", - "integrity": "sha512-wRjoH/b3khsRNb5i4RAyefWQBKUnKdhLWlnqDabOI7du8vZSEluRNTiGYQ23bmFJBUu1RHhb7gTS5WI1VeUkiA==", - "requires": { - "debug": "^2.2.0", - "jsonp": "^0.2.0", - "keymirror": "^0.1.1" - } - }, "react-youtube": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/react-youtube/-/react-youtube-7.9.0.tgz", diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json index 4a353221b68ce17a3cf3e6166644e4b82f495102..6eb69525e7b768779703f926b3778eaa3126c660 100755 --- a/bigbluebutton-html5/package.json +++ b/bigbluebutton-html5/package.json @@ -63,7 +63,6 @@ "react-toastify": "^4.5.2", "react-toggle": "~4.0.2", "react-transition-group": "^2.5.3", - "react-vimeo": "^2.0.0", "react-youtube": "^7.9.0", "reconnecting-websocket": "~v4.1.10", "redis": "~2.8.0",