You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/05/22 11:43:25 UTC
svn commit: r1596795 -
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml
Author: lofwyr
Date: Thu May 22 09:43:25 2014
New Revision: 1596795
URL: http://svn.apache.org/r1596795
Log:
add a CSP warning, when activated
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml?rev=1596795&r1=1596794&r2=1596795&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml Thu May 22 09:43:25 2014
@@ -29,12 +29,15 @@
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="20px;110px;*;auto"/>
+ <tc:gridLayout rows="20px;20px;110px;*;auto"/>
</f:facet>
<tc:out markup="strong" rendered="#{not htmlEditor.ckeditorAvailable}"
value="The CKEditor is not installed! Using the fallback textarea."/>
+ <tc:out markup="strong" rendered="#{tobagoContext.tobagoConfig.contentSecurityPolicy.mode == 'ON'}"
+ value="CSP is ON! CKEditor is not compatible with CSP!"/>
+
<tc:panel>
<f:facet name="layout">
<tc:flowLayout/>