From 17d1ed114c78e77d3608929873d49e95f03368a7 Mon Sep 17 00:00:00 2001
From: AymaneKhouaji <akhouaji@linagora.com>
Date: Tue, 7 Feb 2017 07:25:08 +0100
Subject: [PATCH] Support all timecode formats for YouTube preview (#4957)
 (#5032)

---
 webapp/components/youtube_video.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/components/youtube_video.jsx b/webapp/components/youtube_video.jsx
index 908a2c74ea..7b7133af36 100644
--- a/webapp/components/youtube_video.jsx
+++ b/webapp/components/youtube_video.jsx
@@ -57,16 +57,16 @@ export default class YoutubeVideo extends React.Component {
     }
 
     handleYoutubeTime(link) {
-        const timeRegex = /[\\?&]t=([0-9hms]+)/;
+        const timeRegex = /[\\?&]t=([0-9]+h)?([0-9]+m)?([0-9]+s?)/;
 
         const time = link.match(timeRegex);
-        if (!time || !time[1]) {
+        if (!time || !time[0]) {
             return '';
         }
 
-        const hours = time[1].match(/([0-9]+)h/);
-        const minutes = time[1].match(/([0-9]+)m/);
-        const seconds = time[1].match(/([0-9]+)s/);
+        const hours = time[1] ? time[1].match(/([0-9]+)h/) : null;
+        const minutes = time[2] ? time[2].match(/([0-9]+)m/) : null;
+        const seconds = time[3] ? time[3].match(/([0-9]+)s?/) : null;
 
         let ticks = 0;