Merge pull request #319 from billba/master

video cleanup; versioning
microsoft · Feb 1, 2017 · 5598371 · 5598371
2 parents 6dd5ddb + 09f69dd
commit 5598371
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 61 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "botframework-webchat",
-  "version": "0.5.1",
+  "version": "0.6.5",
   "description": "Embeddable web chat control for the Microsoft Bot Framework",
   "main": "built/BotChat.js",
   "types": "botchat.d.ts",
@@ -21,7 +21,7 @@
   "author": "Microsoft Corp",
   "license": "MIT",
   "dependencies": {
-    "botframework-directlinejs": "^0.6.3",
+    "botframework-directlinejs": "^0.6.4",
     "core-js": "^2.4.1",
     "he": "^1.1.0",
     "marked": "^0.3.6",

diff --git a/src/Attachment.tsx b/src/Attachment.tsx
@@ -13,44 +13,24 @@ const YOUTUBE_WWW_SHORT_DOMAIN = "www.youtu.be";
 const VIMEO_DOMAIN = "vimeo.com";
 const VIMEO_WWW_DOMAIN = "www.vimeo.com";
 
-interface VideoEmbedQuery {
-    loop?: number;
-    autoplay?: number;
-    modestbranding?: number;
-    title?: number;
-    byline?: number;
-    portait?: number;
-    badge?: number;
-    [propName: string]: number;
+interface QueryParams {
+    [propName: string]: string;
 }
 
-export const queryParams = (
-    src: string
-) => {
-    const queryObject = {};
-
-    src.substr(1)
-        .split('&')
-        .forEach(field => {
-            const keyValue = field.split('=');
-            queryObject[decodeURIComponent(keyValue[0])] = decodeURIComponent(keyValue[1]);
-        });
-
-    return queryObject;
-}
-
-const buildUrl = (
-    src: string,
-    query: VideoEmbedQuery,
-) => {
-    return [
-        src,
-        '?',
-        Object.keys(query)
-            .map(key => encodeURIComponent(key) + '=' + encodeURIComponent(query[key].toString()))
-            .join('&')
-    ].join('');
-}
+export const queryParams = (src: string) =>
+    src
+    .substr(1)
+    .split('&')
+    .reduce((previous, current) => {
+        const keyValue = current.split('=');
+        previous[decodeURIComponent(keyValue[0])] = decodeURIComponent(keyValue[1]);
+        return previous;
+    }, {} as QueryParams);
+
+const queryString = (query: QueryParams) =>
+    Object.keys(query)
+    .map(key => encodeURIComponent(key) + '=' + encodeURIComponent(query[key].toString()))
+    .join('&');
 
 const buttons = (
     buttons: Button[],
@@ -67,16 +47,11 @@ const Youtube = (props: {
 }) =>
     <iframe
         type="text/html"
-        src={
-            buildUrl(
-                `https://${YOUTUBE_DOMAIN}/embed/${props.embedId}`,
-                {
-                    modestbranding: 1,
-                    loop: props.loop ? 1 : 0,
-                    autoplay: props.autoPlay ? 1 : 0
-                }
-            )
-        }
+        src={ `https://${YOUTUBE_DOMAIN}/embed/${props.embedId}?${queryString({
+            modestbranding: '1',
+            loop: props.loop ? '1' : '0',
+            autoplay: props.autoPlay ? '1' : '0'
+        })}` }
     />;
 
 const Vimeo = (props: {
@@ -86,19 +61,14 @@ const Vimeo = (props: {
 }) =>
     <iframe
         type="text/html"
-        src={
-            buildUrl(
-                `https://player.${VIMEO_DOMAIN}/video/${props.embedId}`,
-                {
-                    title: 0,
-                    byline: 0,
-                    portrait: 0,
-                    badge: 0,
-                    autoplay: props.autoPlay ? 1 : 0,
-                    loop: props.loop ? 1 : 0
-                }
-            )
-        }
+        src={ `https://player.${VIMEO_DOMAIN}/video/${props.embedId}?${queryString({
+            title: '0',
+            byline: '0',
+            portrait: '0',
+            badge: '0',
+            autoplay: props.autoPlay ? '1' : '0',
+            loop: props.loop ? '1' : '0'
+        })}` }
     />;
 
 const Video = (props: {