"MDL-20603, restore tinymce media plugin, we will have a brand new moodlemedia plugin"

diff --git a/lib/editor/tinymce/extra/patches/tinymce_plugin_media.patch b/lib/editor/tinymce/extra/patches/tinymce_plugin_media.patch
deleted file mode 100644 (file)
index 15e102c..0000000
--- a/lib/editor/tinymce/extra/patches/tinymce_plugin_media.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: lib/editor/tinymce/plugins/media/js/media.js
-===================================================================
-RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/plugins/media/js/media.js,v
-retrieving revision 1.1
-diff -u -r1.1 media.js
---- lib/editor/tinymce/plugins/media/js/media.js    16 May 2009 20:54:41 -0000  1.1
-+++ lib/editor/tinymce/plugins/media/js/media.js    17 May 2009 07:44:27 -0000
-@@ -263,6 +263,13 @@
- 
-        h += ' />';
- 
-+        var is_youtube = repo_hook(f.src.value);
-+        if (is_youtube) {
-+            var re = new RegExp("v\/(.+)\#(.+)", "i");
-+            var result = f.src.value.match(re);
-+            h = '<a href="'+f.src.value+'">'+result[2]+'</a>';
-+        }
-+
-        ed.execCommand('mceInsertContent', false, h);
-    }
- 
-@@ -310,7 +317,11 @@
-        f.height.value = '350';
-        f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
-        return 'flash';
--   }
-+   } else if (v.match(/v\/(.+)(.*)/)) {
-+       f.width.value = '425';
-+       f.height.value = '350';
-+       return 'flash';
-+    }
- 
-    // Google video
-    if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
-@@ -627,4 +638,15 @@
-    p.innerHTML = "<!-- x --->" + h;
- }
- 
-+function repo_hook(url){
-+   var f = document.forms[0];
-+   if (url.match(/v\/(.+)(.*)/)) {
-+       f.width.value = '425';
-+       f.height.value = '350';
-+        return true;
-+   } else {
-+        return false;
-+    }
-+}
-+
- tinyMCEPopup.onInit.add(init);

diff --git a/lib/editor/tinymce/plugins/media/js/media.js b/lib/editor/tinymce/plugins/media/js/media.js
index 380d073a473d08a0c32443898df416a4bc0da4e9..86cfa98563d829fed029f6bc164bc4bc6493b0ef 100644 (file)
--- a/lib/editor/tinymce/plugins/media/js/media.js
+++ b/lib/editor/tinymce/plugins/media/js/media.js
@@ -263,13 +263,6 @@ function insertMedia() {
 \r
                h += ' />';\r
 \r
-        var is_youtube = repo_hook(f.src.value);\r
-        if (is_youtube) {\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
        }\r
 \r
@@ -317,11 +310,7 @@ function getType(v) {
                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
 \r
        // Google video\r
        if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {\r
@@ -638,15 +627,4 @@ function generatePreview(c) {
        p.innerHTML = "<!-- x --->" + h;\r
 }\r
 \r
-function repo_hook(url){\r
-       var f = document.forms[0];\r
-       if (url.match(/v\/(.+)(.*)/)) {\r
-               f.width.value = '425';\r
-               f.height.value = '350';\r
-        return true;\r
-       } else {\r
-        return false;\r
-    }\r
-}\r
-\r
 tinyMCEPopup.onInit.add(init);\r

diff --git a/lib/editor/tinymce/plugins/media/media.htm b/lib/editor/tinymce/plugins/media/media.htm
index 37c778b092418f8ab34874a484ab84a018cde55d..911c03dcc59e4757f0cbddda361e0fa6d5a5dac4 100644 (file)
--- a/lib/editor/tinymce/plugins/media/media.htm
+++ b/lib/editor/tinymce/plugins/media/media.htm
@@ -29,7 +29,7 @@
                                                                <td><label for="media_type">{#media_dlg.type}</label></td>\r
                                                                <td>\r
                                                                        <select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">\r
-                                                                               <option value="flash">Flash/Youtube</option>\r
+                                                                               <option value="flash">Flash</option>\r
                                                                                <!-- <option value="flv">Flash video (FLV)</option> -->\r
                                                                                <option value="qt">Quicktime</option>\r
                                                                                <option value="shockwave">Shockwave</option>\r