"); - String encodedValue = escapeXml(value); + String encodedValue = escapeXml(value.replaceAll("((\r?\n)+|\t*)", "")); if (Compatibility.check(request.getHeader("user-agent"))) { @@ -230,6 +231,5 @@ // create IFrame - // TODO eventuell mit neuer Pfadstruktur untersuchen - String sLink = basePath + "editor/fckeditor.html?InstanceName=" + instanceName; + String sLink = basePath + "/editor/fckeditor.html?InstanceName=" + instanceName; if (Utils.isNotEmpty(toolbarSet)) sLink += "&Toolbar=" + toolbarSet; Index: Keditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/ContentTag.java =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/ContentTag.java (revision 1526) +++ (revision ) @@ -1,31 +1,0 @@ -package net.fckeditor.tags; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.Tag; - -public class ContentTag extends BodyTagSupport { - - private static final long serialVersionUID = 8640710306648001050L; - private Tag ancestor; - - @Override - public int doStartTag() throws JspException { - ancestor = findAncestorWithClass(this, EditorTag.class); - if (ancestor == null) - throw new JspException( - "the content tag can only be nested within an editor tag"); - return EVAL_BODY_BUFFERED; - } - - @Override - public int doAfterBody() throws JspException { - - EditorTag editorTag = (EditorTag) ancestor; - String strippedBody = getBodyContent().getString().replaceAll("((\r?\n)+|\t*)", ""); - editorTag.setValue(strippedBody); - - return SKIP_BODY; - } - -} Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EditorTag.java =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EditorTag.java (revision 1526) +++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EditorTag.java (revision 1527) @@ -74,4 +74,5 @@ private String height; private String toolbarSet; + private String value; private String basePath; @@ -79,4 +80,10 @@ private FCKeditor fckEditor; + /** + * Sets the name for the given editor instance + * + * @param instanceName + * some name without whitespaces + */ public void setInstanceName(String instanceName) { this.instanceName = instanceName; @@ -84,5 +91,5 @@ /** - * Set the width of the textarea + * Sets the width of the textarea * * @param width @@ -95,5 +102,5 @@ /** - * Set the height of the textarea + * Sets the height of the textarea * * @param height @@ -105,7 +112,8 @@ /** - * Set the name of the toolbar to display + * Sets the name of the toolbar to display * - * @param toolbarSet toolbar set of the editor instance + * @param toolbarSet + * toolbar set of the editor instance */ public void setToolbarSet(String toolbarSet) { @@ -113,12 +121,19 @@ } - void setValue(String value) { - fckEditor.setValue(value); + /** + * Sets the editor document content + * + * @param value + * any HTML string + */ + public void setValue(String value) { + this.value = value; } /** - * Set the dir where the FCKeditor files reside on the server + * Sets the dir where the FCKeditor files reside on the server * - * @param basePath basePath of the editor instance (e.g. /fckeditor) + * @param basePath + * basePath of the editor instance (e.g. /fckeditor) */ public void setBasePath(String basePath) { @@ -131,12 +146,13 @@ /** - * Initialize the FCKeditor container and set attributes + * Initializes the FCKeditor container and Sets attributes * - * @return EVAL_BODY_BUFFERED + * @return EVAL_BODY_INCLUDE */ public int doStartTag() throws JspException { fckEditor = new FCKeditor( (HttpServletRequest) pageContext.getRequest(), instanceName, - width, height, toolbarSet, basePath); + width, height, toolbarSet, value, basePath); + fckEditor.setValue(value); return EVAL_BODY_INCLUDE; Index: /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld (revision 1526) +++ /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld (revision 1527) @@ -4,6 +4,5 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - version="2.0" -> + version="2.0"> The FCKeditor Tag Library offers a very convenient way to create @@ -64,22 +63,14 @@ java.lang.String + + + Passes any content to the FCKeditor document. Use + jsp:attribute tag for large inline content. + + value + java.lang.String + ]]> - - - - - Passes any content to the FCKeditor document. This tag can - only be nested within an editor tag. - - content - content - net.fckeditor.tags.ContentTag - JSP - - This is some sample text. You are - using FCKeditor. -]]>