mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V4.1-BUG-FIX to HEAD
38321: Removing unused installer resource file
38322: ALF-14652: Installation: Friendly message about busy Tomcat SSL port should be more exact
- Translations from Gloria
38336: Merged DEV to V4.1-BUG-FIX
38212: ALF-13650: Double byte code white spaces in front and at the end of a file name should be removed as the same behaviour of Single byte code white space.
Altered Alfresco.util.trim() in order to support double byte code white spaces.
38337: Fixed ALF-14117 "Unable to load 'old version' wiki page if the title is in Japanese"
- Regression: The fixes for ALF-6737 & ALF-8427 provided 2 different solutions for the same problem resulting in a double encoding of the page title
38344: ALF-14674: Deployment installer still doesn't work
- Use ${installdir.escape_backslashes} instead of ${installdir}
38345: ALF-14824 - About Share - animation on about dialog corrupts screen on iPad
38400: ALF-14438: Accepted patch from BRANCHES/DEV/BELARUS/... with some modifications and using activiti-naming-conventions
38415: ALF-14808 - patched YUI2.9.0 to handle 'touchend' event to correctly hide pop-up menus when a click/touch occurs outside the menu area.
38417: Fix for ALF-14812 and ALF-14813 - evaluator config for Edit Online and Edit Offline actions.
38421: Fix for ALF-14814 - correct height of previewer area when no preview is available. Also improved the handling of Previewer for iOS - skip the WebPreviewer plugin altogether - this removes the unhelpful message about Installing Adobe Flash etc.
38471: ALF-14674: Deployment installer still doesn't work
- Correction to use of ${installdir.escape_backslashes}
38540: Corrected use of ?html and ?js_string operators for element ID
38548: ALF-14829 - Removed delay added iPad specific CSS to increase hit area of actions in main and more menus.
38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0
Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used.
38575: ALF-14504: PostgreSQL: Schema differences upgrading from 3.4.8 to 4.0.2
Allow for primary key alf_node_assoc_pkey to have an optional '1' at the end of its name (PostgreSQL) - for upgrade path 3.4.8 to 4.0.2
38582: ALF-14504: PostgreSQL: Schema differences upgrading from 3.4.8 to 4.0.2
Ignore avm_child_entries PK name differences.
38585: ALF-14599 ftp.ipv6.enabled is configured in alfresco-global by default, but is not injected nor implemented for FTP
38586: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
38354: ALF-14738: Add information to manifests in all war files
38393: ALF-10804: WCM - Using multiple instances of the same TinyMCE plugin in the same form causes configuration inheritance issues
- TinyMCE initialization and configuration moved into _createTinyMCE:function()
- TinyMCE initialization moved to onLoadContent event callback
- TinyMCE settings application uses init() now
38406: ALF-14738: use correct property for build number
38438: ALF-14856: Documents uploaded via WebDAV mount from Windows 7, and copied by a jscript rule are zero-length
- Simplified fix. Don't fire on-create-node-trigger if on-content-create-trigger would fire, so that policy.content.update.ignoreEmpty=true is respected
- policy.content.update.ignoreEmpty=true now the default as it is required by OSX and Windows 7
38459: ALF-13567: "manager-osx" should be called "Application Manager" inside the installation folder
- Fix from Bitrock
38460: ALF-11817: No versioning when modify/save file content via mapped Webdav network drive
- parseRequestHeader() now trys harder to parse the "Microsoft-WebDAV-MiniRedir" client's buggy "Lock-Token" header.
38476: Merged DEV to V3.4-BUG-FIX
38475: ALF-14868:CLONE - 'Error 0x80070057: The parameter is incorrect' occurs often during upload of documents via WebDAV
Port fix from ALF-14636:
Make XML-streaming WebDAV Methods buffer their response in case of transaction retries
38502: ALF-14876: awe.log and share.log were left after uninstalling Alfresco
- Fix by Bitrock
38561: Merged V3.4 to V3.4-BUG-FIX
38414: ALF-14402: Merged PATCHES/V3.4.6 to V3.4
38028: ALF-13827: Prevent excessive cache chatter by avoiding replicating the aspects, properties and parent associations caches
38416: (RECORD ONLY) ALF-14852: Merged V3.4-BUG-FIX to V3.4
37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -977,38 +977,67 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
|
||||
}
|
||||
}
|
||||
|
||||
for (var i in this._params)
|
||||
// ALF-11956: Each RTE instance MUST BE configured with 'xformstabfocus' plugin to handle Shift + Tab keys
|
||||
if (!this._params["plugins"] || (0 == this._params["plugins"].length))
|
||||
{
|
||||
if (i in tinyMCE.settings)
|
||||
{
|
||||
alfresco.log("setting tinyMCE.settings[" + i + "] = " + this._params[i]);
|
||||
tinyMCE.settings[i] = this._params[i];
|
||||
}
|
||||
}
|
||||
|
||||
tinyMCE.settings.height = (this._params["height"]>0) ? parseInt(this._params["height"]) : this.widget.style.height;
|
||||
tinyMCE.settings.width = (this._params["width"]>0) ? parseInt(this._params["width"]) : this.widget.style.width;
|
||||
|
||||
// ALF-9089
|
||||
if (this._params["convert_fonts_to_spans"]=="false") tinyMCE.settings.convert_fonts_to_spans = false;
|
||||
|
||||
tinyMCE.settings.auto_focus = this.widget.id;
|
||||
tinyMCE.execCommand("mceAddControl", false, this.widget.id)
|
||||
var editorDocument = tinyMCE.get(this.widget.id).getDoc();
|
||||
editorDocument.widget = this;
|
||||
|
||||
if (navigator.userAgent.contains('Safari'))
|
||||
{
|
||||
// ETHREEOH-2568 bug fixing
|
||||
this.domNode.onmouseout = this._tinyMCE_blurHandler.bindAsEventListener(this);
|
||||
this._params["plugins"] = "xformstabfocus";
|
||||
}
|
||||
else
|
||||
{
|
||||
tinymce.dom.Event.add(editorDocument,window.ie ? "mouseout" : "blur",
|
||||
this._tinyMCE_blurHandler);
|
||||
if (-1 == this._params["plugins"].indexOf("xformstabfocus"))
|
||||
{
|
||||
this._params["plugins"] += ",xformstabfocus"
|
||||
}
|
||||
}
|
||||
|
||||
tinymce.dom.Event.add(editorDocument, "focus", this._tinyMCE_focusHandler);
|
||||
|
||||
this._params["height"] = (this._params["height"] > 0) ? parseInt(this._params["height"]) : this.widget.style.height;
|
||||
this._params["width"] = (this._params["width"] > 0) ? parseInt(this._params["width"]) : this.widget.style.width;
|
||||
|
||||
var t = this;
|
||||
this._params["setup"] = function(ed)
|
||||
{
|
||||
ed.onLoadContent.add(function(ed)
|
||||
{
|
||||
var editorDocument = ed.getDoc();
|
||||
if (null == editorDocument.widget)
|
||||
{
|
||||
editorDocument.widget = t;
|
||||
|
||||
if ("false" == t._params["convert_fonts_to_spans"])
|
||||
{
|
||||
ed.settings.convert_fonts_to_spans = false;
|
||||
}
|
||||
|
||||
ed.settings.auto_focus = t.widget.id;
|
||||
|
||||
if (navigator.userAgent.contains("Safari"))
|
||||
{
|
||||
// ETHREEOH-2568 bug fixing
|
||||
t.domNode.onmouseout = t._tinyMCE_blurHandler.bindAsEventListener(t);
|
||||
}
|
||||
else
|
||||
{
|
||||
tinymce.dom.Event.add(editorDocument, window.ie ? "mouseout" : "blur", t._tinyMCE_blurHandler);
|
||||
}
|
||||
|
||||
tinymce.dom.Event.add(editorDocument, "focus", t._tinyMCE_focusHandler);
|
||||
}
|
||||
});
|
||||
|
||||
// Fix for issue in browsers where content is not saved after fullscreen mode is toggled off
|
||||
ed.onSetContent.add(function(ed, o)
|
||||
{
|
||||
//if fullscreen plugin is available and o has these values, then we're coming out of fullscreen mode only
|
||||
if (o.set && (undefined === o.initial) && ("raw" === o.format) && (-1 != ed.settings.plugins.indexOf('fullscreen')))
|
||||
{
|
||||
alfresco.xforms.RichTextEditor.currentInstance._commitValueChange(alfresco.xforms.RichTextEditor.currentInstance.getValue());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
tinyMCE.init(this._params);
|
||||
tinyMCE.execCommand("mceAddControl", false, this.widget.id);
|
||||
|
||||
this._created = true;
|
||||
},
|
||||
|
||||
@@ -5627,17 +5656,16 @@ alfresco.constants.TINY_MCE_DEFAULT_SETTINGS =
|
||||
{
|
||||
theme: "advanced",
|
||||
mode: "exact",
|
||||
plugins: ((alfresco.constants.TINY_MCE_DEFAULT_PLUGINS && (alfresco.constants.TINY_MCE_DEFAULT_PLUGINS.length > 0)) ? (alfresco.constants.TINY_MCE_DEFAULT_PLUGINS + ",xformstabfocus") : ("xformstabfocus")), // ALF-11956: Each RTE instance MUST BE configured with 'xformstabfocus' plugin to handle Shift + Tab keys
|
||||
plugins: alfresco.constants.TINY_MCE_DEFAULT_PLUGINS,
|
||||
form_scope_id: "alfresco-xforms-ui", // ALF-11956: Id of a root container for all widgets. Scope of elements search
|
||||
editor_condition: 'accesskey="z"', // ALF-11956: CSS class of element which handles events for RTE
|
||||
forward_element_classes: "xformsAccessibilityInvisibleText", // ALF-11956
|
||||
backward_element_classes: "mceButton mceButtonEnabled", // ALF-11956
|
||||
editor_condition: 'accesskey="z"', // ALF-11956: CSS select condition for an element which should be interpreted as the "central" element of the RTE. Focusable element searching will be started from this element
|
||||
forward_element_classes: "xformsAccessibilityInvisibleText", // ALF-11956: These CSS classes MUST BE applied to an element which should be interpreted as focusable during forward navigation
|
||||
backward_element_classes: "mceButton mceButtonEnabled", // ALF-11956: These CSS classes MUST BE applied to an element which should be interpreted as focusable during backward navigation
|
||||
language: alfresco.constants.LANGUAGE,
|
||||
width: -1,
|
||||
height: -1,
|
||||
auto_resize: false,
|
||||
force_p_newlines: false,
|
||||
// forced_root_block: false,
|
||||
encoding: "UTF-8",
|
||||
entity_encoding: "raw",
|
||||
add_unload_trigger: false,
|
||||
@@ -5649,22 +5677,8 @@ alfresco.constants.TINY_MCE_DEFAULT_SETTINGS =
|
||||
theme_advanced_buttons3: "",
|
||||
urlconverter_callback: "alfresco_TinyMCE_urlconverter_callback",
|
||||
file_browser_callback: "alfresco_TinyMCE_file_browser_callback",
|
||||
setup : function(ed)
|
||||
{
|
||||
// Fix for issue in browsers where content is not saved after fullscreen mode is toggled off
|
||||
ed.onSetContent.add(function(ed, o) {
|
||||
//if fullscreen plugin is available and o has these values, then we're coming out of fullscreen mode only
|
||||
if ((ed.settings.plugins.indexOf('fullscreen')!=-1) && o.set && o.format==='raw' && o.initial===undefined)
|
||||
{
|
||||
alfresco.xforms.RichTextEditor.currentInstance._commitValueChange(alfresco.xforms.RichTextEditor.currentInstance.getValue());
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
tinyMCE.init($extend({}, alfresco.constants.TINY_MCE_DEFAULT_SETTINGS));
|
||||
|
||||
window.addEvent("domready",
|
||||
function()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user