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 BRANCHES/DEV/BELARUS/HEAD-2010_01_11 to HEAD (with modifications)

Browse Source 
18309: ALF-514 & ALF-775: Changes not being applied during online modification of Web Content in WebKit based browsers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-04-12 12:05:40 +00:00
parent 2bf2fc4d91
commit c6ac8d8243
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -934,8 +934,18 @@ 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 ? "mouseout" : "blur",
this._tinyMCE_blurHandler);
if (navigator.userAgent.contains('Safari'))
{
// ETHREEOH-2568 bug fixing
this.domNode.onmouseout = this._tinyMCE_blurHandler.bindAsEventListener(this);
}
else
{
tinymce.dom.Event.add(editorDocument,window.ie ? "mouseout" : "blur",
this._tinyMCE_blurHandler);
}
tinymce.dom.Event.add(editorDocument, "focus", this._tinyMCE_focusHandler);
this._created = true;
},
@@ -1053,11 +1063,24 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
_tinyMCE_blurHandler: function(event)
{
var widget;
if (event.type == "mouseout")
{
event.target = event.srcElement.ownerDocument;
if (window.ie)
{
event.target = event.srcElement.ownerDocument;
widget = event.target.widget;
}
else
{
widget = this;
}
}
var widget = event.target.widget;
else
{
widget = event.target.widget;
}
var value = widget.getValue();
if (value != widget._oldValue)
{
@@ -4350,10 +4373,10 @@ alfresco.xforms.XForm = new Class({
/** sets the repeat indexes by calling XFormsBean.setRepeatIndeces. */
setRepeatIndeces: function(repeatIndeces)
{
// The following debug statement is causing performance and rendering issues (ETWOTWO-1006,
// ETHREEOH-3155 & ETHREEOH-2653), only uncomment this line if necessary for fault finding.
// alfresco.log("setting repeat indeces [" + repeatIndeces.join(", ") + "]");
// The following debug statement is causing performance and rendering issues (ETWOTWO-1006,
// ETHREEOH-3155 & ETHREEOH-2653), only uncomment this line if necessary for fault finding.
// alfresco.log("setting repeat indeces [" + repeatIndeces.join(", ") + "]");
var params = { };
params["repeatIds"] = [];
for (var i = 0; i < repeatIndeces.length; i++)