diff --git a/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java index a1c245f534..c7637f8dc3 100644 --- a/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java +++ b/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java @@ -276,6 +276,10 @@ public abstract class BaseTemplateContentServlet extends BaseServlet throw e; } } + finally + { + res.getWriter().close(); + } } catch (Throwable txnErr) { diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java index a3a7266505..f7c3bd6f57 100644 --- a/source/java/org/alfresco/web/ui/common/Utils.java +++ b/source/java/org/alfresco/web/ui/common/Utils.java @@ -167,15 +167,6 @@ public final class Utils case '&': enc = "&"; break; //& case '<': enc = "<"; break; //< case '>': enc = ">"; break; //> - - //german umlauts - case '\u00E4' : enc = "ä"; break; - case '\u00C4' : enc = "Ä"; break; - case '\u00F6' : enc = "ö"; break; - case '\u00D6' : enc = "Ö"; break; - case '\u00FC' : enc = "ü"; break; - case '\u00DC' : enc = "Ü"; break; - case '\u00DF' : enc = "ß"; break; //misc //case 0x80: enc = "€"; break; sometimes euro symbol is ascii 128, should we suport it? diff --git a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js index 47f72da733..148d510f22 100644 --- a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js +++ b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js @@ -40,11 +40,24 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave) ? alfresco.constants.AVM_WEBAPP_URL + href : href); } + if (href && href.startsWith(document.location.href)) { result = href.substring(document.location.href.length); } + + // handle URL issue with IE (WCM-1134) + if (tinyMCE.isMSIE) + { + var server = document.location.protocol + "//" + document.location.host; + if (href && href.startsWith(server)) + { + result = href.substring(server.length); + } + } + // dojo.debug("alfresco_TinyMCE_urlconverter_callback('" + href + "', ... , " + onsave + ") = " + result); + return result; } diff --git a/source/web/scripts/office/my_tasks.js b/source/web/scripts/office/my_tasks.js index 621d71bf0a..609e1d8d2d 100644 --- a/source/web/scripts/office/my_tasks.js +++ b/source/web/scripts/office/my_tasks.js @@ -5,6 +5,8 @@ */ var OfficeMyTasks = { + MAX_DESCRIPTION: 100, + init: function() { OfficeAddin.sortTasks($('taskList')); @@ -47,6 +49,20 @@ var OfficeMyTasks = dateFormat: "dd MMMM yyyy" }); } + + if ($('wrkDescription')) + { + var desc = $('wrkDescription'); + + desc.onkeyup = desc.onchange = desc.onblur = function(event) + { + if (this.value.length > OfficeMyTasks.MAX_DESCRIPTION) + { + this.setProperty('value', this.getProperty('value').substr(0, OfficeMyTasks.MAX_DESCRIPTION)); + } + } + + } }, setupEventHandlers: function()