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.2E to HEAD

Browse Source 
17495: Changed xforms-samples name to wcm-sample
   17496: Minor fixes for day and week views when rendering new events
   17497: *RECORD ONLY* Added Enterprise logo local copy.
   17498: ETHREEOH-2933 - User can see contents of the moderated site if user is not a member of the site
          - Site containers are now private and non member's can't see content.
          - fix only applies to new moderated sites.
   17499: ETHREEOH-2322 - Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces
   17500: Temorary build fix for site visibility
   17508: ETHREEOH-1268 - Pages and Components show varying degrees of success handling "site not found" errors.
   17509: Fix for ETHREEOH1733 - Wrong display of multi day events in Share
   17514: View In Browser action for document list and document details actions.
   17515: Merged DEV-TEMPORARY to V3.2
      17471: ETHREEOH-3193: 'capitalize' in output path pattern works differently for templates (vs. XSDs)
   17516: Missing css file from Edit Offline changes. Also "Checked out on/by" text changed to "Editing started on/by". Tags now comma separated
   17517: Merged DEV-TEMPORARY to V3.2
      17474: ETHREEOH-1211: Can't See Images in TinyMCE
   17518: Office add-in: ETHREEOH-3361 - Workflow name is visible only before symbol &, ETHREEOH-2735 - Total number of founded items is not shown
   17519: 3.2E help links
   17520: 3.2E help links, plus ETHREEOH-1536 - Incorrect "insert into current document" function work for unsupported files in MS Office Addin
   17522: Fix for ETHREEOH-3257 - Event becomes All day again after editing it to not All day
   17526: Fix for unreported issue when rendering an edited event after the view is filtered via tag component causes an script error
   17528: Fixed ETHREEOH-3364 " Admin Console - Group Search needs to show searching message and disable further requests while search is running"
          - Disabling search button & message displaying "Searching..." after 2 seconds for long searches for the following components:
             * Admin Console: Users - search user, add group
             * Admin Console: Groups - search group, add group, add user
             * Site: Members: People - search members, add people
             * Site: Members: Groups - search membergroups, add group
             * Site: Members: Pending invites - search invites
             * Site: Doclib: Assign Workflow - add users
             * People Finder 
             * Site Finder
          - All component listed above uses max search result except the following where webscript services lacks support for it:
             * Admin Console: Users - add group
             * Admin Console: Groups - search group, add group
             * Site: Members: Pending invites - search invites
          - Bugfix: When minSearchTermLength is set to 0:
             * Group Admin Console: switched to browse view
             * User Admin Console: didnt do a search
          - Bugfix: For some components minSearchTermLength & maxSearchResults were brought in as strings causing the global search's max result to be 1001 instead of 101

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-19 11:50:05 +00:00
parent 97f06f3773
commit 189422edce
17 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
}
// handle URL issue with IE (WCM-1134)
if (tinyMCE.isMSIE)
if (navigator.appName == "Microsoft Internet Explorer" || tinyMCE.isMSIE)
{
var server = document.location.protocol + "//" + document.location.host;
if (href.startsWith(server))

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

@@ -967,9 +967,21 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
$each(this.widget.getElementsByTagName("img"),
function(img, index)
{
if (img.getAttribute("src") && img.getAttribute("src").match("^/"))
var href = img.getAttribute("src");
//Fix for ETHREEOH-1211
if (navigator.appName == "Microsoft Internet Explorer" || tinyMCE.isMSIE)
{
img.setAttribute("src", alfresco.constants.AVM_WEBAPP_URL + img.getAttribute("src"));
var server = document.location.protocol + "//" + document.location.host;
if (href.startsWith(server))
{
href = href.substring(server.length);
}
}
if (href && href.match("^/"))
{
img.setAttribute("src", alfresco.constants.AVM_WEBAPP_URL + href);
}
});
@@ -4755,7 +4767,6 @@ alfresco.constants.TINY_MCE_DEFAULT_SETTINGS =
height: -1,
auto_resize: false,
force_p_newlines: false,
forced_root_block:false,
encoding: "UTF-8",
entity_encoding: "raw",
add_unload_trigger: false,