"MDL-16911, display video name for youtube link"

diff --git a/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt b/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
index 9234f670d4ce1a764ade174b2c25e38240e65e22..24d85fc36e88b289fd691cacb55657dc4d92276b 100644 (file)
--- a/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
+++ b/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
@@ -11,7 +11,9 @@ diff -u -r1.3 media.js
  \r
 +        var is_youtube = repo_hook(f.src.value);\r
 +        if (is_youtube) {\r
-+            h = '<a href="'+f.src.value+'">youtube video</a>';\r
++            var re = new RegExp("v\/(.+)\#(.+)", "i");
++            var result = f.src.value.match(re);
++            h = '<a href="'+f.src.value+'">'+result[2]+'</a>';
 +        }\r
 +\r
                ed.execCommand('mceInsertContent', false, h);\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 72262eb9cdce3fbc6e8daaa505435f1eae9beb86..401b0a01cb4ee8e09c3d6a20d97a64f2b94dad8f 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
@@ -264,8 +264,11 @@ function insertMedia() {
                h += ' />';\r
 \r
         var is_youtube = repo_hook(f.src.value);\r
+\r
         if (is_youtube) {\r
-            h = '<a href="'+f.src.value+'">youtube video</a>';\r
+            var re = new RegExp("v\/(.+)\#(.+)", "i");\r
+            var result = f.src.value.match(re);\r
+            h = '<a href="'+f.src.value+'">'+result[2]+'</a>';\r
         }\r
 \r
                ed.execCommand('mceInsertContent', false, h);\r

diff --git a/repository/youtube/repository.class.php b/repository/youtube/repository.class.php
index 4c19813fce8a76f00400954b9658a81c37dbec2b..a11b4becf88bfaf5466415759562774266223930 100644 (file)
--- a/repository/youtube/repository.class.php
+++ b/repository/youtube/repository.class.php
@@ -49,7 +49,7 @@ class repository_youtube extends repository {
                 'thumbnail_height'=>120,
                 'size'=>'',
                 'date'=>'',
-                'source'=>$source
+                'source'=>$source.'#'.$title
             );
         } 
         return $list;