webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed tinymce video embed

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-09-06 09:24:02 +02:00
parent 2b9351b227
commit ac22f35479
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tinymce

@ -1 +1 @@
Subproject commit 852cb110810fc18804be991f7bfe39a71d3b2091 Subproject commit 3f7b36895386926ea4027d6c3994e1ed96fad465

10
sai/modules/saimod_sys_text/js/saimod_sys_text.js
View File

@ -60,7 +60,7 @@ function init_saimod_sys_text_editor(){
new_id: new_id, new_id: new_id,
lang: lang, lang: lang,
tags: JSON.stringify($('#input_tags').val().split(',').map(function(s) { return s.trim() })), tags: JSON.stringify($('#input_tags').val().split(',').map(function(s) { return s.trim() })),
text: encodeURIComponent(tinyMCE.activeEditor.getContent({format : 'raw'}))}, text: encodeURIComponent(tinymce.activeEditor.getContent({format : 'raw'}))},
success : function(data) { success : function(data) {
if(data.status){ if(data.status){
alert('success'); alert('success');
@ -145,18 +145,20 @@ function init_tinymce(){
username : "Some User", username : "Some User",
staffid : "991234" staffid : "991234"
}*/ }*/
//extended_valid_elements: "iframe[title|class|type|width|height|src|frameborder|allowFullScreen]",
//extended_valid_elements: "iframe[class|src|frameborder=0|alt|title|width|height|align|name]",
//extended_valid_elements: "iframe[id|class|title|style|align|frameborder|height|longdesc|marginheight|marginwidth|name|scrolling|src|width]",
selector: "textarea", selector: "textarea",
theme: "modern", theme: "modern",
//theme : "advanced", //theme : "advanced",
plugins: [ plugins: [
"advlist autolink lists link image charmap print preview hr anchor pagebreak", "advlist autolink lists link image charmap print preview hr anchor pagebreak",
"searchreplace wordcount visualblocks visualchars code fullscreen", "searchreplace wordcount visualblocks visualchars code fullscreen",
"insertdatetime media nonbreaking save table contextmenu directionality", "insertdatetime nonbreaking save table contextmenu directionality",//media
"emoticons template paste textcolor" "emoticons template paste textcolor"
], ],
toolbar1: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image", toolbar1: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
toolbar2: "print preview media | forecolor backcolor emoticons", toolbar2: "print preview | forecolor backcolor emoticons",//media
image_advtab: true, image_advtab: true,
templates: [ templates: [
{title: 'Test template 1', content: 'Test 1'}, {title: 'Test template 1', content: 'Test 1'},