yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes: TinyMCE Embed Media - Insert youtube video not working

Browse Source 
Work items: 30378
This commit is contained in:
starfighter83
2011-11-16 10:21:52 -01:00
parent 82d1a980f7
commit d6341e73b6
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config templates/config/tinyMceConfig.config
View File

@@ -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[*]]]>
</validElements>
<invalidElements>font</invalidElements>

2
umbraco/presentation/config/tinyMceConfig.config
View File

@@ -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[*]]]>
</validElements>
<invalidElements>font</invalidElements>

14
umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js
View File

@@ -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();
});
})();
})();