Merge 73eea09 into ad0d7e0

summernote · Dec 13, 2018 · 453c6e5 · 453c6e5
2 parents ad0d7e0 + 73eea09
commit 453c6e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/js/base/module/VideoDialog.js b/src/js/base/module/VideoDialog.js
@@ -83,6 +83,9 @@ export default class VideoDialog {
     const webmRegExp = /^.+.(webm)$/;
     const webmMatch = url.match(webmRegExp);
 
+    const fbRegExp = /(?:www\.|\/\/)facebook\.com\/([^\/]+)\/videos\/([0-9]+)/;
+    const fbMatch = url.match(fbRegExp);
+
     let $video;
     if (ytMatch && ytMatch[1].length === 11) {
       const youtubeId = ytMatch[1];
@@ -139,6 +142,13 @@ export default class VideoDialog {
       $video = $('<video controls>')
         .attr('src', url)
         .attr('width', '640').attr('height', '360');
+    } else if (fbMatch && fbMatch[0].length) {
+      $video = $('<iframe>')
+        .attr('frameborder', 0)
+        .attr('src', 'https://www.facebook.com/plugins/video.php?href=' + encodeURIComponent(fbMatch[0]) + '&show_text=0&width=560')
+        .attr('width', '560').attr('height', '301')
+        .attr('scrolling', 'no')
+        .attr('allowtransparency', 'true');
     } else {
       // this is not a known video link. Now what, Cat? Now what?
       return false;

diff --git a/test/unit/base/module/VideoDialog.spec.js b/test/unit/base/module/VideoDialog.spec.js
@@ -51,6 +51,9 @@ describe('VideoDialog', () => {
         '//v.qq.com/iframe/player.html?vid=f0196y2b2cx&amp;auto=0');
       expectUrl('http://v.qq.com/x/page/p0330y279lm.html',
         '//v.qq.com/iframe/player.html?vid=p0330y279lm&amp;auto=0');
+      // Facebook
+      expectUrl('https://www.facebook.com/Engineering/videos/631826881803/',
+        '//www.facebook.com/plugins/video.php?href=www.facebook.com%2FEngineering%2Fvideos%2F631826881803');
     });
 
     it('should be embedded start parameter when insert YouTube video with t', () => {