1 files changed, 12 insertions, 12 deletions

diff --git a/vnext/src/utils/embed.js b/vnext/src/utils/embed.js
index 22dacd8b..2e2f0aca 100644
--- a/vnext/src/utils/embed.js
+++ b/vnext/src/utils/embed.js
@@ -16,7 +16,7 @@ function setContent(containerNode, ...newNodes) {
 }
 
 function removeAllFrom(fromNode) {
-  for (let c; c = fromNode.lastChild; ) { fromNode.removeChild(c); }
+  fromNode.innerHTML = '';
 }
 
 // rules :: [{pr: number, re: RegExp, with: string}]
@@ -88,7 +88,7 @@ function makeResizable(element, calcHeight) {
 }
 
 function extractDomain(url) {
-  const domainRe = /^(?:https?:\/\/)?(?:[^@\/\n]+@)?(?:www\.)?([^:\/\n]+)/i;
+  const domainRe = /^(?:https?:\/\/)?(?:[^@/\n]+@)?(?:www\.)?([^:/\n]+)/i;
   let result = domainRe.exec(url) || [];
   if (result.length > 0) {
     return result[1];
@@ -126,7 +126,7 @@ function messageReplyReplace(messageId) {
  * @returns {string} formatted message
  */
 function juickFormat(txt, messageId, isCode) {
-  const urlRe = /(?:\[([^\]\[]+)\](?:\[([^\]]+)\]|\(((?:[a-z]+:\/\/|www\.|ftp\.)(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[-\w+*&@#/%=~|$?!:;,.])*(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[\w+*&@#/%=~|$]))\))|\b(?:[a-z]+:\/\/|www\.|ftp\.)(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[-\w+*&@#/%=~|$?!:;,.])*(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[\w+*&@#/%=~|$]))/gi;
+  const urlRe = /(?:\[([^\][]+)\](?:\[([^\]]+)\]|\(((?:[a-z]+:\/\/|www\.|ftp\.)(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[-\w+*&@#/%=~|$?!:;,.])*(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[\w+*&@#/%=~|$]))\))|\b(?:[a-z]+:\/\/|www\.|ftp\.)(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[-\w+*&@#/%=~|$?!:;,.])*(?:\([-\w+*&@#/%=~|$?!:;,.]*\)|[\w+*&@#/%=~|$]))/gi;
   const bqReplace = m => m.replace(/^(?:>|>)\s?/gmi, '');
   return (isCode)
     ? formatText(txt, [
@@ -139,9 +139,9 @@ function juickFormat(txt, messageId, isCode) {
       { pr: 1, re: urlRe, with: urlReplace },
       { pr: 1, re: /\B(?:#(\d+))?(?:\/(\d+))?\b/g, with: messageReplyReplace(messageId) },
       { pr: 1, re: /\B@([\w-]+)\b/gi, with: '<a href="/$1">@$1</a>' },
-      { pr: 2, re: /\B\*([^\n]+?)\*((?=\s)|(?=$)|(?=[!\"#$%&'*+,\-./:;<=>?@[\]^_`{|}~()]+))/g, brackets: true, with: ['<b>', '</b>'] },
-      { pr: 2, re: /\B\/([^\n]+?)\/((?=\s)|(?=$)|(?=[!\"#$%&'*+,\-./:;<=>?@[\]^_`{|}~()]+))/g, brackets: true, with: ['<i>', '</i>'] },
-      { pr: 2, re: /\b\_([^\n]+?)\_((?=\s)|(?=$)|(?=[!\"#$%&'*+,\-./:;<=>?@[\]^_`{|}~()]+))/g, brackets: true, with: ['<span class="u">', '</span>'] },
+      { pr: 2, re: /\B\*([^\n]+?)\*((?=\s)|(?=$)|(?=[!"#$%&'*+,\-./:;<=>?@[\]^_`{|}~()]+))/g, brackets: true, with: ['<b>', '</b>'] },
+      { pr: 2, re: /\B\/([^\n]+?)\/((?=\s)|(?=$)|(?=[!"#$%&'*+,\-./:;<=>?@[\]^_`{|}~()]+))/g, brackets: true, with: ['<i>', '</i>'] },
+      { pr: 2, re: /\b_([^\n]+?)_((?=\s)|(?=$)|(?=[!"#$%&'*+,\-./:;<=>?@[\]^_`{|}~()]+))/g, brackets: true, with: ['<span class="u">', '</span>'] },
       { pr: 3, re: /\n/g, with: '<br/>' },
     ]);
 }
@@ -153,7 +153,7 @@ function getEmbeddableLinkTypes() {
       id: 'embed_jpeg_and_png_images',
       className: 'picture compact',
       ctsDefault: false,
-      re: /\.(jpe?g|png|svg)(:[a-zA-Z]+)?(?:\?[\w&;\?=]*)?$/i,
+      re: /\.(jpe?g|png|svg)(:[a-zA-Z]+)?(?:\?[\w&;?=]*)?$/i,
       makeNode: function(aNode, reResult, div) {
         div.innerHTML = `<a href="${aNode.href}"><img src="${aNode.href}"></a>`;
         return div;
@@ -164,7 +164,7 @@ function getEmbeddableLinkTypes() {
       id: 'embed_gif_images',
       className: 'picture compact',
       ctsDefault: true,
-      re: /\.gif(:[a-zA-Z]+)?(?:\?[\w&;\?=]*)?$/i,
+      re: /\.gif(:[a-zA-Z]+)?(?:\?[\w&;?=]*)?$/i,
       makeNode: function(aNode, reResult, div) {
         div.innerHTML = `<a href="${aNode.href}"><img src="${aNode.href}"></a>`;
         return div;
@@ -175,7 +175,7 @@ function getEmbeddableLinkTypes() {
       id: 'embed_webm_and_mp4_videos',
       className: 'video compact',
       ctsDefault: false,
-      re: /\.(webm|mp4|m4v|ogv)(?:\?[\w&;\?=]*)?$/i,
+      re: /\.(webm|mp4|m4v|ogv)(?:\?[\w&;?=]*)?$/i,
       makeNode: function(aNode, reResult, div) {
         div.innerHTML = `<video src="${aNode.href}" title="${aNode.href}" controls></video>`;
         return div;
@@ -186,7 +186,7 @@ function getEmbeddableLinkTypes() {
       id: 'embed_sound_files',
       className: 'audio singleColumn',
       ctsDefault: false,
-      re: /\.(mp3|ogg|weba|opus|m4a|oga|wav)(?:\?[\w&;\?=]*)?$/i,
+      re: /\.(mp3|ogg|weba|opus|m4a|oga|wav)(?:\?[\w&;?=]*)?$/i,
       makeNode: function(aNode, reResult, div) {
         div.innerHTML = `<audio src="${aNode.href}" title="${aNode.href}" controls></audio>`;
         return div;
@@ -197,7 +197,7 @@ function getEmbeddableLinkTypes() {
       id: 'embed_youtube_videos',
       className: 'youtube resizableV singleColumn',
       ctsDefault: false,
-      re: /^(?:https?:)?\/\/(?:www\.|m\.|gaming\.)?(?:youtu(?:(?:\.be\/|be\.com\/(?:v|embed)\/)([-\w]+)|be\.com\/watch)((?:(?:\?|&(?:amp;)?)(?:\w+=[-\.\w]*[-\w]))*)|youtube\.com\/playlist\?list=([-\w]*)(&(amp;)?[-\w\?=]*)?)/i,
+      re: /^(?:https?:)?\/\/(?:www\.|m\.|gaming\.)?(?:youtu(?:(?:\.be\/|be\.com\/(?:v|embed)\/)([-\w]+)|be\.com\/watch)((?:(?:\?|&(?:amp;)?)(?:\w+=[-.\w]*[-\w]))*)|youtube\.com\/playlist\?list=([-\w]*)(&(amp;)?[-\w?=]*)?)/i,
       makeNode: function(aNode, reResult, div) {
         let [v, args, plist] = reResult;
         let iframeUrl;
@@ -293,7 +293,7 @@ function getEmbeddableLinkTypes() {
 
 function embedLink(aNode, linkTypes, container, afterNode) {
   let anyEmbed = false;
-  let linkId = (aNode.href.replace(/^https?:/i, '').replace(/\'/gi,''));
+  let linkId = (aNode.href.replace(/^https?:/i, '').replace(/'/gi,''));
   let sameEmbed = container.querySelector(`*[data-linkid='${linkId}']`); // do not embed the same thing twice
   if (sameEmbed === null) {
     anyEmbed = [].some.call(linkTypes, function(linkType) {