Author: alevkovsky Date: 2008-10-23 09:46:20 -0400 (Thu, 23 Oct 2008) New Revision: 10883 Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java Modified: trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.xcss trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/content.xcss trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/css/content.xcss trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js trunk/sandbox/ui/editor/src/main/templates/editor.jspx Log: Add resource renderer Modified: trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml =================================================================== --- trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml 2008-10-23 13:46:20 UTC (rev 10883) @@ -36,6 +36,7 @@ <resource> <name>scripts/tiny_mce/plugins/advhr/rule.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advhr/rule.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/advimage/css/advimage.xcss</name> @@ -54,6 +55,7 @@ <resource> <name>scripts/tiny_mce/plugins/advimage/image.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advimage/image.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/advimage/img/sample.gif</name> @@ -96,6 +98,7 @@ <resource> <name>scripts/tiny_mce/plugins/advlink/link.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/advlink/link.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/autosave/editor_plugin.js</name> @@ -160,6 +163,7 @@ <resource> <name>scripts/tiny_mce/plugins/emotions/emotions.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/emotions/emotions.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/emotions/img/smiley-cool.gif</name> @@ -238,6 +242,7 @@ <resource> <name>scripts/tiny_mce/plugins/example/dialog.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/example/dialog.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/example/editor_plugin.js</name> @@ -285,6 +290,7 @@ <resource> <name>scripts/tiny_mce/plugins/fullpage/fullpage.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullpage/fullpage.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/fullpage/js/fullpage.js</name> @@ -309,6 +315,7 @@ <resource> <name>scripts/tiny_mce/plugins/fullscreen/fullscreen.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/fullscreen/fullscreen.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/iespell/editor_plugin.js</name> @@ -365,6 +372,7 @@ <resource> <name>scripts/tiny_mce/plugins/inlinepopups/template.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/template.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/insertdatetime/editor_plugin.js</name> @@ -450,6 +458,7 @@ <resource> <name>scripts/tiny_mce/plugins/media/media.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/media.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/nonbreaking/editor_plugin.js</name> @@ -496,6 +505,7 @@ <resource> <name>scripts/tiny_mce/plugins/paste/blank.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/blank.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/paste/css/blank.xcss</name> @@ -533,10 +543,12 @@ <resource> <name>scripts/tiny_mce/plugins/paste/pastetext.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/pastetext.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/paste/pasteword.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/paste/pasteword.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/preview/editor_plugin.js</name> @@ -551,6 +563,7 @@ <resource> <name>scripts/tiny_mce/plugins/preview/example.html</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/example.html</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/preview/jscripts/embed.js</name> @@ -560,6 +573,7 @@ <resource> <name>scripts/tiny_mce/plugins/preview/preview.html</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/preview/preview.html</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/print/editor_plugin.js</name> @@ -574,6 +588,7 @@ <resource> <name>scripts/tiny_mce/plugins/safari/blank.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/safari/blank.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/safari/editor_plugin.js</name> @@ -622,6 +637,7 @@ <resource> <name>scripts/tiny_mce/plugins/searchreplace/searchreplace.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/searchreplace/searchreplace.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/spellchecker/css/content.xcss</name> @@ -668,10 +684,12 @@ <resource> <name>scripts/tiny_mce/plugins/style/props.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/style/props.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/table/cell.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/cell.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/table/css/cell.xcss</name> @@ -723,18 +741,22 @@ <resource> <name>scripts/tiny_mce/plugins/table/merge_cells.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/merge_cells.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/table/row.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/row.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/table/table.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/table/table.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/template/blank.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/blank.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/template/css/template.xcss</name> @@ -763,6 +785,7 @@ <resource> <name>scripts/tiny_mce/plugins/template/template.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/template/template.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/visualchars/editor_plugin.js</name> @@ -777,18 +800,22 @@ <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/abbr.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/abbr.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/acronym.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/acronym.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/attributes.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/attributes.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/cite.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/cite.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/css/attributes.xcss</name> @@ -801,6 +828,7 @@ <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/del.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/del.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js</name> @@ -815,6 +843,7 @@ <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/ins.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/plugins/xhtmlxtras/ins.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js</name> @@ -859,18 +888,22 @@ <resource> <name>scripts/tiny_mce/themes/advanced/about.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/about.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/themes/advanced/anchor.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/anchor.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/themes/advanced/charmap.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/charmap.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/themes/advanced/color_picker.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/color_picker.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/themes/advanced/editor_template.js</name> @@ -885,6 +918,7 @@ <resource> <name>scripts/tiny_mce/themes/advanced/image.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/image.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/themes/advanced/img/colorpicker.jpg</name> @@ -942,6 +976,7 @@ <resource> <name>scripts/tiny_mce/themes/advanced/link.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/link.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/themes/advanced/skins/default/content.xcss</name> @@ -1014,6 +1049,7 @@ <resource> <name>scripts/tiny_mce/themes/advanced/source_editor.htm</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/source_editor.htm</path> + <renderer class="org.richfaces.renderkit.resources.EditorHTMLRenderer"/> </resource> <resource> <name>scripts/tiny_mce/themes/simple/editor_template.js</name> Modified: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java =================================================================== --- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java 2008-10-23 13:46:20 UTC (rev 10883) @@ -34,6 +34,7 @@ import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.util.InputUtils; +import org.ajax4jsf.webapp.WebXml; import org.richfaces.component.UIEditor; /** @@ -104,4 +105,12 @@ return fieldValue; } + protected String getFacesMappingSuffix(FacesContext context) { + String suffix = WebXml.getInstance(context).getFacesServletSuffix(); + if (suffix == null) { + suffix = ""; + } + return suffix; + } + } Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java =================================================================== --- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java (rev 0) +++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-10-23 13:46:20 UTC (rev 10883) @@ -0,0 +1,137 @@ +/** + * + */ +package org.richfaces.renderkit.resources; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; + +import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.BaseResourceRenderer; +import org.ajax4jsf.resource.InternetResource; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.webapp.WebXml; + +/** + * Editor html pages renderer - used for correcting scripts src + * @author Alexandr Levkovsky + * + */ +public class EditorHTMLRenderer extends BaseResourceRenderer { + + /** + * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() + */ + @Override + protected String[][] getCommonAttrs() { + return null; + } + + /** + * @see org.ajax4jsf.resource.BaseResourceRenderer#getHrefAttr() + */ + @Override + protected String getHrefAttr() { + return null; + } + + /** + * @see org.ajax4jsf.resource.BaseResourceRenderer#getTag() + */ + @Override + protected String getTag() { + return "span"; + } + + /** + * @see org.ajax4jsf.resource.ResourceRenderer#getContentType() + */ + public String getContentType() { + return "text/html"; + } + + /** + * @see org.ajax4jsf.resource.BaseResourceRenderer#send(org.ajax4jsf.resource.InternetResource, org.ajax4jsf.resource.ResourceContext) + */ + @Override + public int send(InternetResource base, ResourceContext context) + throws IOException { + + InputStream in = base.getResourceAsStream(context); + OutputStream out = context.getOutputStream(); + if (null == in) { + String message = Messages.getMessage( + Messages.NO_INPUT_STREAM_ERROR, base.getKey()); + throw new IOException(message); + } + int total; + + // update scripts src + String mappingSuffix = getFacesMappingSuffix(base); + if (mappingSuffix != null) { + total = updateAndSendResource(in, out, mappingSuffix); + } else { + total = sendStream(in, out); + } + + return total; + } + + /** + * Method to correct scripts src + * @param resource + */ + private int updateAndSendResource(InputStream in, OutputStream out, + String mappingSuffix) throws IOException { + + //TODO Pasha, replace with regular expression if needed? + + int total = 0; + BufferedReader br = new BufferedReader(new InputStreamReader(in)); + BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(out)); + try { + while (br.ready()) { + String line = br.readLine(); + if (line.indexOf(".js") != -1) { + line = line.replace(".js", ".js" + mappingSuffix); + } + bw.write(line); + bw.newLine(); + total += line.getBytes().length; + } + } finally { + bw.flush(); + br.close(); + bw.close(); + in.close(); + out.close(); + } + return total; + } + + /** + * Method to get servlet mapping suffix + * + * @param context + * @return + */ + private String getFacesMappingSuffix(InternetResource resource) { + WebXml w = WebXml.getInstance(); + String suffix = w.getFacesServletSuffix(); + return suffix; + } + + /** + * @see org.ajax4jsf.resource.BaseResourceRenderer#requireFacesContext() + */ + @Override + public boolean requireFacesContext() { + return true; + } + +} Property changes on: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-23 13:46:20 UTC (rev 10883) @@ -1,7 +1,6 @@ if (!window.Richfaces) window.Richfaces = {}; Richfaces.Editor = {}; Richfaces.Editor.REGEXP_CSS = /(\/tiny_mce\/(?:themes|plugins)\/[\w\.\\\/]*[\w\.]+\.)(c|C)[sS]{2}$/; -Richfaces.Editor.preInit = {extSuffix:".jsf"}; /*Richfaces.Editor.getResourceURL = function (baseURL, type) { return Richfaces.Editor.ResourceHTML.replace("$1", baseURL); };*/ @@ -9,16 +8,19 @@ RichEditor = Class.create(); Object.extend(RichEditor.prototype, { - initialize: function(id, parameters) { + initialize: function(id, parameters, suffix) { this.id = id; this.editorTextAreaId = this.id +'TextArea'; this.params = parameters; + this.suffix = suffix; var obj = $(this.id); obj.component = this; obj.richfacesComponent="richfaces:editor"; this["rich:destructor"] = "destruct"; + tinymce.extSuffix = this.suffix; + tinyMCE.init({ mode: this.params.mode, theme: this.params.theme, Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.xcss =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.xcss 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.xcss 2008-10-23 13:46:20 UTC (rev 10883) @@ -146,7 +146,17 @@ </u:selector> <f:verbatim> <![CDATA[ -.clearlooks2 .mceBottom .mceRight {right:0; width:5px; background: url(img/corners.gif) -34px 0} +.clearlooks2 .mceBottom .mceRight {right:0; width:5px} +]]> +</f:verbatim> +<u:selector name=".clearlooks2 .mceBottom .mceRight"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif"/> + </u:style> + <u:style name="background-position" value="-34px 0"/> +</u:selector> +<f:verbatim> +<![CDATA[ .clearlooks2 .mceBottom span {display:none} .clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px} ]]> @@ -157,20 +167,12 @@ </u:style> <u:style name="background-position" value="-29px 0"/> </u:selector> -<f:verbatim> -<![CDATA[ -]]> -</f:verbatim> <u:selector name=".clearlooks2 .mceStatusbar .mceBottom .mceCenter"> <u:style name="background-image"> <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif"/> </u:style> <u:style name="background-position" value="0 -52px"/> </u:selector> -<f:verbatim> -<![CDATA[ -]]> -</f:verbatim> <u:selector name=".clearlooks2 .mceStatusbar .mceBottom .mceRight"> <u:style name="background-image"> <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif"/> Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/content.xcss =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/content.xcss 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/css/content.xcss 2008-10-23 13:46:20 UTC (rev 10883) @@ -5,11 +5,31 @@ <f:verbatim><![CDATA[ .mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;} -.mceItemShockWave {background-image: url(../img/shockwave.gif);} -.mceItemFlash {background-image:url(../img/flash.gif);} -.mceItemQuickTime {background-image:url(../img/quicktime.gif);} -.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);} -.mceItemRealMedia {background-image:url(../img/realmedia.gif);} ]]> </f:verbatim> +<u:selector name=".mceItemShockWave"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/shockwave.gif"/> + </u:style> +</u:selector> +<u:selector name=".mceItemFlash"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/flash.gif"/> + </u:style> +</u:selector> +<u:selector name=".mceItemQuickTime"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/quicktime.gif"/> + </u:style> +</u:selector> +<u:selector name=".mceItemWindowsMedia"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/windowsmedia.gif"/> + </u:style> +</u:selector> +<u:selector name=".mceItemRealMedia"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/media/img/realmedia.gif"/> + </u:style> +</u:selector> </f:template> Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/css/content.xcss =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/css/content.xcss 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/css/content.xcss 2008-10-23 13:46:20 UTC (rev 10883) @@ -4,7 +4,15 @@ xmlns="http://www.w3.org/1999/xhtml" > <f:verbatim><![CDATA[ -.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../img/pagebreak.gif) no-repeat center top;} +.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px} ]]> </f:verbatim> +<u:selector name=".mcePageBreak"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif"/> + </u:style> + <u:style name="background-color" value="#fff"/> + <u:style name="background-repeat" value="no-repeat"/> + <u:style name="background-position" value="center top"/> +</u:selector> </f:template> Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2008-10-23 13:46:20 UTC (rev 10883) @@ -17,13 +17,6 @@ t.isIE6 = t.isIE && /MSIE [56]/.test(ua); t.isGecko = !t.isWebKit && /Gecko/.test(ua); t.isMac = ua.indexOf('Mac') != -1; - - // RF: added by PY - if (Richfaces.Editor && Richfaces.Editor.preInit) - { - t.extSuffix = Richfaces.Editor.preInit.extSuffix; - } - // RF: end // TinyMCE .NET webcontrol might be setting the values for TinyMCE if (w.tinyMCEPreInit) { Modified: trunk/sandbox/ui/editor/src/main/templates/editor.jspx =================================================================== --- trunk/sandbox/ui/editor/src/main/templates/editor.jspx 2008-10-23 13:42:07 UTC (rev 10882) +++ trunk/sandbox/ui/editor/src/main/templates/editor.jspx 2008-10-23 13:46:20 UTC (rev 10883) @@ -21,11 +21,12 @@ #{this:getFormattedComponentStringValue(context, component)} </textarea> - <script type="text/javascript"> + <script type="text/javascript"> new RichEditor('#{clientId}', { mode: '#{component.attributes['mode']}', - theme: '#{component.attributes['theme']}' - }); + theme: '#{component.attributes['theme']}'}, + '#{this:getFacesMappingSuffix(context)}' + ); </script> </div> </f:root>