inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
18358: Merged DEV_TEMPORARY to V3.2
                  18177 & 18342:  ETHREEOH-3979: Web Forms: Inline images within TinyMCE controls aren't displayed correctly

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-01-28 21:18:35 +00:00
parent 974b578395
commit 6989a3fcb3
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/web/scripts/ajax/tiny_mce_wcm_extensions.js vendored
View File

@@ -41,7 +41,8 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
{
if (href.startsWith(alfresco.constants.AVM_WEBAPP_URL))
{
result = href.substring(alfresco.constants.AVM_WEBAPP_URL.length);
//do nothin. AVM_WEBAPP_URL will be removed during saving image in _tinyMCE_blurHandler
result = href;
}
else if (href.startsWith("/"))
{

4
source/web/scripts/ajax/xforms.js
View File

@@ -933,7 +933,7 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
tinyMCE.execCommand("mceAddControl", false, this.widget.id)
var editorDocument = tinyMCE.get(this.widget.id).getDoc();
editorDocument.widget = this;
tinymce.dom.Event.add(editorDocument,window.ie ? "beforedeactivate" : "blur",
tinymce.dom.Event.add(editorDocument,window.ie ? "mouseout" : "blur",
this._tinyMCE_blurHandler);
tinymce.dom.Event.add(editorDocument, "focus", this._tinyMCE_focusHandler);
this._created = true;
@@ -1052,7 +1052,7 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
_tinyMCE_blurHandler: function(event)
{
if (event.type == "beforedeactivate")
if (event.type == "mouseout")
{
event.target = event.srcElement.ownerDocument;
}