disallow iframes and script in default

niklasnatter · May 26, 2015 · b79554a · b79554a
1 parent 481ead2
commit b79554a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/demos/ckeditor/ckeditor.html b/demos/ckeditor/ckeditor.html
@@ -72,7 +72,7 @@
                             }
                         }]'
                     data-aura-ui-color="#ffcc00"
-                    ></textarea>
+                    >Texteditor sample with custom ckeditor parameters</textarea>
         </div>
         <div id="content-2" class="grid">
                 <textarea
@@ -81,7 +81,7 @@
                     data-aura-max-height="50"
                     data-aura-language="de"
                     data-aura-instance-name="myInstance-2"
-                    data-aura-enter-mode="br"></textarea>
+                    data-aura-enter-mode="br">Texteditor sample with BR Entermode</textarea>
         </div>
 
         <script src="../../bower_components/jquery/jquery.js"></script>

diff --git a/dist/husky.js b/dist/husky.js
@@ -45066,7 +45066,7 @@ define('__component__$data-navigation@husky',[
                 removePlugins: 'elementspath,magicline',
                 removeDialogTabs: 'image:advanced;link:advanced',
                 extraPlugins: 'justify,format,sourcearea,link,table,pastefromword,autogrow',
-                extraAllowedContent: 'img(*)[*]; span(*)[*]; div(*)[*]; iframe(*)[*]; script(*)[*]',
+                extraAllowedContent: 'img(*)[*]; span(*)[*]; div(*)[*]',
                 resize_enabled: false,
                 enterMode: 'P',
                 uiColor: '#ffffff',

diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/husky_extensions/ckeditor-extension.js b/husky_extensions/ckeditor-extension.js
@@ -34,7 +34,7 @@
                 removePlugins: 'elementspath,magicline',
                 removeDialogTabs: 'image:advanced;link:advanced',
                 extraPlugins: 'justify,format,sourcearea,link,table,pastefromword,autogrow',
-                extraAllowedContent: 'img(*)[*]; span(*)[*]; div(*)[*]; iframe(*)[*]; script(*)[*]',
+                extraAllowedContent: 'img(*)[*]; span(*)[*]; div(*)[*]',
                 resize_enabled: false,
                 enterMode: 'P',
                 uiColor: '#ffffff',