From d9344fc349e8c5765898c90bf5061e56cd21c8a0 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Tue, 15 Apr 2008 17:22:00 -0400
Subject: [PATCH] HTML editing fixes, upgrade to TinyMCE v3.0.6
---
program/js/app.js | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 410aad8..8393eca 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1897,25 +1897,22 @@
}
else
{
- var eid = tinyMCE.getEditorId('_message');
- // editor is a TinyMCE_Control object
- var editor = tinyMCE.getInstanceById(eid);
+ var editor = tinyMCE.get('compose-body');
// if this is null, we should exit
- if (editor == null) {
+ if (editor == null)
+ {
return false;
- }
- var msgDoc = editor.getDoc();
- var msgBody = msgDoc.body;
+ }
if (this.env.signatures && this.env.signatures[id])
{
// Append the signature as a span within the body
- var sigElem = msgDoc.getElementById("_rc_sig");
+ var sigElem = editor.dom.get("_rc_sig");
if (!sigElem)
{
- sigElem = msgDoc.createElement("span");
+ sigElem = editor.getDoc().createElement("span");
sigElem.setAttribute("id", "_rc_sig");
- msgBody.appendChild(sigElem);
+ editor.getBody().appendChild(sigElem);
}
if (this.env.signatures[id]['is_html'])
{
@@ -3396,16 +3393,16 @@
};
- this.toggle_editor = function(checkbox, textElementName)
+ this.toggle_editor = function(checkbox, textAreaId)
{
var ischecked = checkbox.checked;
if (ischecked)
{
- tinyMCE.execCommand('mceAddControl', true, textElementName);
+ tinyMCE.execCommand('mceAddControl', true, textAreaId);
}
else
{
- tinyMCE.execCommand('mceRemoveControl', true, textElementName);
+ tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
}
};
--
Gitblit v1.9.1