From 0773060acc8e0aa62ce76307744e468965169e23 Mon Sep 17 00:00:00 2001
From: Dongsheng Cai <unoter@gmail.com>
Date: Tue, 10 Nov 2009 07:40:50 +0000
Subject: [PATCH] "MDL-20603, restore tinymce media plugin, we will have a
 brand new moodlemedia plugin"

---
 .../extra/patches/tinymce_plugin_media.patch  | 50 -------------------
 lib/editor/tinymce/plugins/media/js/media.js  | 24 +--------
 lib/editor/tinymce/plugins/media/media.htm    |  2 +-
 3 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 lib/editor/tinymce/extra/patches/tinymce_plugin_media.patch

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
index 15e102c3c2..0000000000
--- 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 380d073a47..86cfa98563 100644
--- a/lib/editor/tinymce/plugins/media/js/media.js
+++ b/lib/editor/tinymce/plugins/media/js/media.js
@@ -263,13 +263,6 @@ function insertMedia() {
 
 		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);
 	}
 
@@ -317,11 +310,7 @@ function getType(v) {
 		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) {
@@ -638,15 +627,4 @@ function generatePreview(c) {
 	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/media.htm b/lib/editor/tinymce/plugins/media/media.htm
index 37c778b092..911c03dcc5 100644
--- 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>
 								<td>
 									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">
-										<option value="flash">Flash/Youtube</option>
+										<option value="flash">Flash</option>
 										<!-- <option value="flv">Flash video (FLV)</option> -->
 										<option value="qt">Quicktime</option>
 										<option value="shockwave">Shockwave</option>
-- 
2.39.5