HTML_EDITOR, REPOSITORY/MDL-16650

media type should be returned.

diff --git a/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt b/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
index 59171677704cfceb7dfe055a48513c9ed301b735..9234f670d4ce1a764ade174b2c25e38240e65e22 100644 (file)
--- a/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
+++ b/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
@@ -25,12 +25,11 @@ diff -u -r1.3 media.js
 +    if (v.match(/watch\?v=(.+)(.*)/)) {\r
                f.width.value = '425';\r
                f.height.value = '350';\r
-               f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];\r
--              return 'flash';\r
 -      }\r
 +      } else if (v.match(/v\/(.+)(.*)/)) {\r
 +              f.width.value = '425';\r
 +              f.height.value = '350';\r
++              return 'flash';\r
 +    }\r
  \r
        // Google video\r

diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
index ab469b6ceb69ae27a442d80421884267d3b1baf3..72262eb9cdce3fbc6e8daaa505435f1eae9beb86 100644 (file)
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -314,9 +314,11 @@ function getType(v) {
                f.width.value = '425';\r
                f.height.value = '350';\r
                f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];\r
+        return 'flash';\r
        } else if (v.match(/v\/(.+)(.*)/)) {\r
                f.width.value = '425';\r
                f.height.value = '350';\r
+        return 'flash';\r
     }\r
 \r
        // Google video\r