mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.1 to HEAD
6636: Temporary hack to fix build. 6637: Better handling of binary string bufs, disable link validation when poll interval is <= 0 6638: Forgotten files for TXT to PDF transformer. 6639: Fix for AWC-1541 6641: Fix for WCM-792. 6642: A little extra PropertyValue support for createNode, too. 6643: Fix for WCM-791 6644: Closure of AR-1528: Check concurrency handling of DuplicateChildNodeNameException 6647: Fix WCM-794 6648: WCM-656 6650: Applied user supplied patch to fix AWC-1546 - Cannot mount AVM using CIFS on new alfresco installation. 6651: Index tidy ups 6654: Various minor updates for passthru authentication debugging and error handling. 6657: Fix for WCM-799 (Some items selected for submission were not present) 6659: Updated installers. 6660: Partial fix to AWC-1524 6661: Fix WCM-803 6664: Including hibernate-3.2.1.jar in $VIRTUAL_TOMCAT_HOME/server/lib/ 6665: adding an automated unit test for output path patterns. 6668: Fixed to add shale-test-1.0.4.jar to Eclipse classpath (PHH oked) 6681: Fixes WCM-811 - Lookup.getIndirectionPath() had a bit of a howler in it. 6684: UncategorizedSQLException with the word 'deadlock' in the message is now cause for retrying a transaction. 6691: Fix for WCM-813 (lock not removed when expiration date set and no workflow on web project) 6696: Imporved SSO filters for SiteMinder etc + test filter 6697: Support for scheduled import 6699: Fix for the compliation target: compile-benchmarkframework 6701: Fix for 1.6 JVMs (1.5 gets by with lucky ordering) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -9,14 +9,15 @@ function handle_upload_helper(fileInputElement,
|
||||
{
|
||||
var id = fileInputElement.getAttribute("name");
|
||||
var d = fileInputElement.ownerDocument;
|
||||
var w = d.defaultView || d.parentWindow;
|
||||
var iframe = d.createElement("iframe");
|
||||
iframe.style.display = "none";
|
||||
iframe.name = id + "upload_frame";
|
||||
iframe.id = iframe.name;
|
||||
document.body.appendChild(iframe);
|
||||
d.body.appendChild(iframe);
|
||||
|
||||
// makes it possible to target the frame properly in ie.
|
||||
window.frames[iframe.name].name = iframe.name;
|
||||
w.frames[iframe.name].name = iframe.name;
|
||||
|
||||
_uploads[uploadId] = { path: fileInputElement.value, callback: callback };
|
||||
|
||||
@@ -33,7 +34,7 @@ function handle_upload_helper(fileInputElement,
|
||||
form.action = contextPath + actionUrl;
|
||||
form.appendChild(fileInputElement);
|
||||
|
||||
var id = document.createElement("input");
|
||||
var id = d.createElement("input");
|
||||
id.type = "hidden";
|
||||
form.appendChild(id);
|
||||
id.name = "upload-id";
|
||||
@@ -41,17 +42,22 @@ function handle_upload_helper(fileInputElement,
|
||||
|
||||
for (var i in params)
|
||||
{
|
||||
var p = document.createElement("input");
|
||||
var p = d.createElement("input");
|
||||
p.type = "hidden";
|
||||
form.appendChild(p);
|
||||
id.name = i;
|
||||
id.value = params[i];
|
||||
}
|
||||
|
||||
var rp = document.createElement("input");
|
||||
var rp = d.createElement("input");
|
||||
rp.type = "hidden";
|
||||
form.appendChild(rp);
|
||||
rp.name = "return-page";
|
||||
if (w != window)
|
||||
{
|
||||
w.upload_complete_helper = window.upload_complete_helper;
|
||||
}
|
||||
|
||||
rp.value = "javascript:window.parent.upload_complete_helper('" + uploadId +
|
||||
"',{error: '${_UPLOAD_ERROR}', fileTypeImage: '${_FILE_TYPE_IMAGE}'})";
|
||||
|
||||
|
Reference in New Issue
Block a user