From: dongsheng <dongsheng>
Date: Tue, 25 Nov 2008 12:20:13 +0000 (+0000)
Subject: HTML_EDITOR, REPOSITORY/MDL-16650
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=942995292eb3c405c7f54b1662a1570d92018b38;p=moodle.git

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 5917167770..9234f670d4 100644
--- 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=(.+)(.*)/)) {
  		f.width.value = '425';
  		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
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 ab469b6ceb..72262eb9cd 100644
--- 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';
 		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