diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java index 550638783c..cf20490ea1 100644 --- a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java +++ b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java @@ -85,7 +85,7 @@ public class UIEditUserProfileForm extends UIForm { "(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + // IPAddress "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|" + // IPAddress "(?:(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+\\.)+" + - "(?:com|org|net|edu|gov|mil|biz|info|mobi|name|aero|jobs|museum|travel|asia|cat|coop|int|pro|tel|xxx|[a-z]{2}))))|" + //Domain + "(?:[a-z]{2,}))))|" + //Domain "(?:(?:(?:ht)tp(?:s?)\\:\\/\\/)(?:\\w+:\\w+@)?(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+))" + // Protocol with hostname ")" + "(?::[\\d]{1,5})?" + // port diff --git a/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js b/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js index 08661adbe8..09dee816c5 100644 --- a/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js +++ b/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js @@ -387,16 +387,16 @@ }); } }, - multipleLineEllipsis : function(selector) { - $(selector).each(function(i,elem) { - var elemChild = elem.querySelector('p'); - if(!elemChild) return; - var elemHeight = elem.clientHeight; - while (elemChild.offsetHeight > elemHeight) { - elemChild.textContent = elemChild.textContent.replace(/\W*\s(\S)*$/, '...'); - } - }); - } + multipleLineEllipsis : function(selector) { + $(selector).each(function(i,elem) { + var elemChild = elem.querySelector('p'); + if(!elemChild) return; + var elemHeight = elem.clientHeight; + while (elemChild.offsetHeight > elemHeight) { + elemChild.textContent = elemChild.textContent.replace(/\W*\s(\S)*$/, '...'); + } + }); + } }; PopupConfirmation = {