Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

LPS-22837 liferay-ui:tabs with unicode characters dont switch tab

  • Loading branch information...
commit ed708c3b2ccf1e14536657f9e8b67cebbda0b659 1 parent 87d4d8d
@zsagia zsagia authored brianchandotcom committed
View
2  portal-web/docroot/html/js/liferay/util.js
@@ -546,8 +546,6 @@
function(name) {
var buffer = [];
- name = unescape(escape(name).replace(/%u/g, '\\u'));
-
for (var i = 0; i < name.length; i++) {
buffer[i] = name.charCodeAt(i);
}
View
2  portal-web/docroot/html/taglib/ui/tabs/end.jsp
@@ -18,6 +18,6 @@
<c:if test="<%= !themeDisplay.isFacebook() %>">
<aui:script>
- Liferay.Portal.Tabs.show("<%= namespace + param %>", <%= namesJS %>, "<%= value %>");
+ Liferay.Portal.Tabs.show("<%= namespace + param %>", <%= namesJS %>, "<%= UnicodeFormatter.toString(value) %>");
</aui:script>
</c:if>
View
5 portal-web/docroot/html/taglib/ui/tabs/start.jsp
@@ -138,7 +138,7 @@ String onClick = GetterUtil.getString((String)request.getAttribute("liferay-ui:t
curURL += "document." + namespace + formName + "." + namespace + param + ".value = '" + names[i] + "';";
}
- curURL += "Liferay.Portal.Tabs.show('" + namespace + param + "', " + namesJS + ", '" + names[i] + "');";
+ curURL += "Liferay.Portal.Tabs.show('" + namespace + param + "', " + namesJS + ", '" + UnicodeFormatter.toString(names[i]) + "');";
}
}
}
@@ -150,8 +150,7 @@ String onClick = GetterUtil.getString((String)request.getAttribute("liferay-ui:t
curOnClick = onClick + "('" + curURL + "', '" + values[i] + "'); return false;";
}
else {
- curOnClick = "Liferay.Portal.Tabs.show('" + namespace + param + "', " + namesJS + ", '" + names[i] + "', " + onClick + ");";
-
+ curOnClick = "Liferay.Portal.Tabs.show('" + namespace + param + "', " + namesJS + ", '" + UnicodeFormatter.toString(names[i]) + "', " + onClick + ");";
curURL = "javascript:;";
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.