Wordpress 3.5

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / media / js / media.js

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