Author: alevkovsky Date: 2008-12-22 08:14:50 -0500 (Mon, 22 Dec 2008) New Revision: 11968 Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js Log: https://jira.jboss.org/jira/browse/RF-5374 Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js =================================================================== --- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-12-22 13:13:30 UTC (rev 11967) +++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-12-22 13:14:50 UTC (rev 11968) @@ -22,23 +22,14 @@ this.synchronizeConfiguration(); this.setDialogType(); + this.redefineCallbacks(); this.tinyMCE_editor = null; - this.onInitInstanceCallbackFunction = this.tinyparams.init_instance_callback; - this.onChangeCallbackFunction = this.tinyparams.onchange_callback; - this.onInitCallbackFunction = this.tinyparams.oninit; - this.onSaveCallbackFunction = this.tinyparams.save_callback; - this.onSetupCallbackFunction = this.tinyparams.setup; this.tinyparams.mode = 'exact'; this.tinyparams.elements = this.editorTextAreaId; this.tinyparams.editor_selector = null; this.tinyparams.editor_deselector = null; - this.tinyparams.init_instance_callback = this.onInitInstanceCallback.bind(this); - this.tinyparams.onchange_callback = this.onChangeCallback.bind(this); - this.tinyparams.oninit = this.onInitCallback.bind(this); - this.tinyparams.save_callback = this.onSaveCallback.bind(this); - this.tinyparams.setup = this.onSetupCallback.bind(this); tinyMCE.init(this.tinyparams); @@ -60,6 +51,31 @@ this.tinyMCE_editor = null; }, + redefineCallbacks: function() { + this.onInitInstanceCallbackFunction = this.tinyparams.init_instance_callback; + this.tinyparams.init_instance_callback = this.onInitInstanceCallback.bind(this); + + if(this.tinyparams.onchange_callback && typeof this.tinyparams.onchange_callback != 'string'){ + this.onChangeCallbackFunction = this.tinyparams.onchange_callback; + this.tinyparams.onchange_callback = this.onChangeCallback.bind(this); + } + + if(this.tinyparams.onchange_callback && typeof this.tinyparams.oninit != 'string'){ + this.onInitCallbackFunction = this.tinyparams.oninit; + this.tinyparams.oninit = this.onInitCallback.bind(this); + } + + if(this.tinyparams.onchange_callback && typeof this.tinyparams.save_callback != 'string'){ + this.onSaveCallbackFunction = this.tinyparams.save_callback; + this.tinyparams.save_callback = this.onSaveCallback.bind(this); + } + + if(this.tinyparams.onchange_callback && typeof this.tinyparams.setup != 'string'){ + this.onSetupCallbackFunction = this.tinyparams.setup; + this.tinyparams.setup = this.onSetupCallback.bind(this); + } + }, + onBeforeAjax: function() { this.tinyMCE_editor.save(); },