From ac22f35479dbfdd8d2211a2b8bc2d81f5860c101 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 6 Sep 2015 09:24:02 +0200
Subject: [PATCH] fixed tinymce video embed

---
 lib/tinymce                                       |  2 +-
 sai/modules/saimod_sys_text/js/saimod_sys_text.js | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/tinymce b/lib/tinymce
index 852cb11..3f7b368 160000
--- a/lib/tinymce
+++ b/lib/tinymce
@@ -1 +1 @@
-Subproject commit 852cb110810fc18804be991f7bfe39a71d3b2091
+Subproject commit 3f7b36895386926ea4027d6c3994e1ed96fad465
diff --git a/sai/modules/saimod_sys_text/js/saimod_sys_text.js b/sai/modules/saimod_sys_text/js/saimod_sys_text.js
index ca7934a..71048c5 100644
--- a/sai/modules/saimod_sys_text/js/saimod_sys_text.js
+++ b/sai/modules/saimod_sys_text/js/saimod_sys_text.js
@@ -60,7 +60,7 @@ function init_saimod_sys_text_editor(){
                                 new_id: new_id,
                                 lang: lang,
                                 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) {
                         if(data.status){
                             alert('success');
@@ -145,18 +145,20 @@ function init_tinymce(){
                 username : "Some User",
                 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",
         theme: "modern",
         //theme : "advanced",
         plugins: [
             "advlist autolink lists link image charmap print preview hr anchor pagebreak",
             "searchreplace wordcount visualblocks visualchars code fullscreen",
-            "insertdatetime media nonbreaking save table contextmenu directionality",
+            "insertdatetime nonbreaking save table contextmenu directionality",//media
             "emoticons template paste textcolor"
         ],
         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,
         templates: [
             {title: 'Test template 1', content: 'Test 1'},