From d6341e73b6d91c304098093ae0a3cc695c798044 Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Wed, 16 Nov 2011 10:21:52 -0100 Subject: [PATCH] Fixes: TinyMCE Embed Media - Insert youtube video not working Work items: 30378 --- config templates/config/tinyMceConfig.config | 2 +- umbraco/presentation/config/tinyMceConfig.config | 2 +- .../tinymce3/plugins/media/js/media.js | 14 ++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/config templates/config/tinyMceConfig.config b/config templates/config/tinyMceConfig.config index 32059d6ad6..75ec2dc971 100644 --- a/config templates/config/tinyMceConfig.config +++ b/config templates/config/tinyMceConfig.config @@ -228,7 +228,7 @@ thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|heig -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align], -h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style], dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[classid|width|height|codebase|*], -param[name|value|_value],embed[type|width|height|src|*],map[name],area[shape|coords|href|alt|target],bdo,button]]> +param[name|value|_value],embed[type|width|height|src|*],map[name],area[shape|coords|href|alt|target],bdo,button,iframe[*]]]> font diff --git a/umbraco/presentation/config/tinyMceConfig.config b/umbraco/presentation/config/tinyMceConfig.config index 2438825b51..ed701a33d7 100644 --- a/umbraco/presentation/config/tinyMceConfig.config +++ b/umbraco/presentation/config/tinyMceConfig.config @@ -233,7 +233,7 @@ thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|heig -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align], -h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style], dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[classid|width|height|codebase|*], -param[name|value|_value],embed[type|width|height|src|*],map[name],area[shape|coords|href|alt|target],bdo,button]]> +param[name|value|_value],embed[type|width|height|src|*],map[name],area[shape|coords|href|alt|target],bdo,button,iframe[*]]]> font diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js index fddd574f1d..e940583d86 100644 --- a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js +++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js @@ -125,9 +125,7 @@ }, preview: function () { - //preview currently disabled because of js error - - //get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true); + get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true); }, moveStates: function (to_form, field) { @@ -302,8 +300,8 @@ data.width = 425; data.height = 350; data.params.frameborder = '0'; - data.type = 'flash'; - src = 'http://www.youtube.com/v/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1]; + data.type = 'iframe'; + src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1]; setVal('src', src); setVal('media_type', data.type); } @@ -313,8 +311,8 @@ data.width = 425; data.height = 350; data.params.frameborder = '0'; - data.type = 'flash'; - src = 'http://www.youtube.com/v/' + src.match(/v=([^&]+)/)[1]; + data.type = 'iframe'; + src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1]; setVal('src', src); setVal('media_type', data.type); } @@ -463,4 +461,4 @@ tinyMCEPopup.onInit.add(function () { Media.init(); }); -})(); +})(); \ No newline at end of file