TinyMCE 3.5.8 update; some fixes

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / media / js / media.js

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
index 733c5f6c284169f979d2e79880128261f0b59718..89cea2a4107ec326b8bc8b3d8e879c869c3780d1 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -78,7 +78,7 @@
                        get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');\r
                        get('audio_altsource1_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource1','audio_altsource1','media','media');\r
                        get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');\r
-                       get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');\r
+                       get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','image','media');\r
 \r
                        html = self.getMediaListHTML('medialist', 'src', 'media', 'media');\r
                        if (html == "")\r
@@ -295,34 +295,77 @@
                        } else {\r
                                src = getVal("src");\r
 \r
-                               // YouTube *NEW*\r
-                               if (src.match(/youtu.be\/[a-z1-9.-_]+/)) {\r
+                               // YouTube Embed\r
+                               if (src.match(/youtube\.com\/embed\/\w+/)) {\r
                                        data.width = 425;\r
                                        data.height = 350;\r
                                        data.params.frameborder = '0';\r
                                        data.type = 'iframe';\r
-                                       src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];\r
                                        setVal('src', src);\r
                                        setVal('media_type', data.type);\r
+                               } else {\r
+                                       // YouTube *NEW*\r
+                                       if (src.match(/youtu\.be\/[a-z1-9.-_]+/)) {\r
+                                               data.width = 425;\r
+                                               data.height = 350;\r
+                                               data.params.frameborder = '0';\r
+                                               data.type = 'iframe';\r
+                                               src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];\r
+                                               setVal('src', src);\r
+                                               setVal('media_type', data.type);\r
+                                       }\r
+\r
+                                       // YouTube\r
+                                       if (src.match(/youtube\.com(.+)v=([^&]+)/)) {\r
+                                               data.width = 425;\r
+                                               data.height = 350;\r
+                                               data.params.frameborder = '0';\r
+                                               data.type = 'iframe';\r
+                                               src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];\r
+                                               setVal('src', src);\r
+                                               setVal('media_type', data.type);\r
+                                       }\r
                                }\r
 \r
-                               // YouTube\r
-                               if (src.match(/youtube.com(.+)v=([^&]+)/)) {\r
+                               // Google video\r
+                               if (src.match(/video\.google\.com(.+)docid=([^&]+)/)) {\r
+                                       data.width = 425;\r
+                                       data.height = 326;\r
+                                       data.type = 'flash';\r
+                                       src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';\r
+                                       setVal('src', src);\r
+                                       setVal('media_type', data.type);\r
+                               }\r
+                               \r
+                               // Vimeo\r
+                               if (src.match(/vimeo\.com\/([0-9]+)/)) {\r
                                        data.width = 425;\r
                                        data.height = 350;\r
                                        data.params.frameborder = '0';\r
                                        data.type = 'iframe';\r
-                                       src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];\r
+                                       src = 'http://player.vimeo.com/video/' + src.match(/vimeo.com\/([0-9]+)/)[1];\r
                                        setVal('src', src);\r
                                        setVal('media_type', data.type);\r
                                }\r
-\r
-                               // Google video\r
-                               if (src.match(/video.google.com(.+)docid=([^&]+)/)) {\r
+            \r
+                               // stream.cz\r
+                               if (src.match(/stream\.cz\/((?!object).)*\/([0-9]+)/)) {\r
                                        data.width = 425;\r
-                                       data.height = 326;\r
-                                       data.type = 'flash';\r
-                                       src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';\r
+                                       data.height = 350;\r
+                                       data.params.frameborder = '0';\r
+                                       data.type = 'iframe';\r
+                                       src = 'http://www.stream.cz/object/' + src.match(/stream.cz\/[^/]+\/([0-9]+)/)[1];\r
+                                       setVal('src', src);\r
+                                       setVal('media_type', data.type);\r
+                               }\r
+                               \r
+                               // Google maps\r
+                               if (src.match(/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/)) {\r
+                                       data.width = 425;\r
+                                       data.height = 350;\r
+                                       data.params.frameborder = '0';\r
+                                       data.type = 'iframe';\r
+                                       src = 'http://maps.google.com/maps/ms?msid=' + src.match(/msid=(.+)/)[1] + "&output=embed";\r
                                        setVal('src', src);\r
                                        setVal('media_type', data.type);\r
                                }\r