Author: pyaschenko Date: 2008-10-29 08:07:43 -0400 (Wed, 29 Oct 2008) New Revision: 10963 Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/css/editor.xcss trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js trunk/sandbox/ui/editor/src/main/templates/editor.jspx Log: Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/css/editor.xcss =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/css/editor.xcss 2008-10-29 10:34:56 UTC (rev 10962) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/css/editor.xcss 2008-10-29 12:07:43 UTC (rev 10963) @@ -11,9 +11,4 @@ </f:verbatim> - <u:selector name=".rich-editor"> - <u:style name="background-color" skin="generalBackgroundColor" /> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - </f:template> 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-29 10:34:56 UTC (rev 10962) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-29 12:07:43 UTC (rev 10963) @@ -1,7 +1,7 @@ if (!window.Richfaces) window.Richfaces = {}; Richfaces.Editor = {}; Richfaces.Editor.REGEXP_CSS = /(\/tiny_mce\/(?:themes|plugins)\/[\w\.\\\/]*[\w\.]+\.)(c|C)[sS]{2}$/; -Richfaces.Editor.extSuffix = ".jsf"; +Richfaces.Editor.extSuffix = ""; RichEditor = Class.create(); Object.extend(RichEditor.prototype, { @@ -18,11 +18,11 @@ Richfaces.Editor.extSuffix = params.suffix; this.tinyMCE_editor = null; - this.onInitInstanceCallback = tinyparams.onInitInstanceCallback; + this.onInitInstanceCallbackFunction = tinyparams.onInitInstanceCallback; tinyMCE.init({ - mode: this.tinyparams.mode, - theme: this.tinyparams.theme, + mode: tinyparams.mode, + theme: tinyparams.theme, init_instance_callback : this.onInitInstanceCallback.bind(this) }); @@ -34,8 +34,10 @@ A4J.AJAX.removeListener(this.onBeforeAjaxListener); if(isAjax){ - this.tinyMCE_editor.remove(); + this.tinyMCE_editor.remove(); } + this.onInitInstanceCallbackFunction = null; + this.tinyMCE_editor = null; }, onBeforeAjax: function() { @@ -44,7 +46,7 @@ onInitInstanceCallback: function(inst) { this.tinyMCE_editor = tinyMCE.get(this.editorTextAreaId); - if (this.onInitInstanceCallback) this.onInitInstanceCallback.call(this, inst); + if (this.onInitInstanceCallbackFunction) this.onInitInstanceCallbackFunction.call(this, inst); } Modified: trunk/sandbox/ui/editor/src/main/templates/editor.jspx =================================================================== --- trunk/sandbox/ui/editor/src/main/templates/editor.jspx 2008-10-29 10:34:56 UTC (rev 10962) +++ trunk/sandbox/ui/editor/src/main/templates/editor.jspx 2008-10-29 12:07:43 UTC (rev 10963) @@ -21,7 +21,7 @@ #{this:getFormattedComponentStringValue(context, component)} </textarea> - <script type="text/javascript"> + <script type="text/javascript"> new RichEditor('#{clientId}', {extSuffix:'#{this:getFacesMappingSuffix(context)}'}, { mode: '#{component.attributes["mode"]}', theme: '#{component.attributes["theme"]}'}