Skip to content

Commit

Permalink
Merge pull request #889 from DevChu/F85-ZK-3636
Browse files Browse the repository at this point in the history
refine ZK-3636
  • Loading branch information
wenninghsu committed Sep 22, 2017
2 parents 774339c + 350fb4a commit 1d73f36
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion zktest/src/archive/test2/F85-ZK-3636.zul
Expand Up @@ -16,6 +16,6 @@ Copyright (C) 2017 Potix Corporation. All Rights Reserved.
<zk>
<window>
you should see 'home' and 'check' icon in the button
<button iconSclass="z-icon-home;z-icon-check" />
<button iconSclass="z-icon-home,z-icon-check" />
</window>
</zk>
2 changes: 1 addition & 1 deletion zul/src/archive/web/js/zul/LabelImageWidget.js
Expand Up @@ -100,7 +100,7 @@ zul.LabelImageWidget = zk.$extends(zul.Widget, {
result = '';
//ZK-3636: Added simple support for stacked font awesome icons
if (icon) {
var icons = icon.split(';'),
var icons = icon.split(','),
length = icons.length;
if (length > 1) {
var arr = ['<span class="z-icon-stack">'];
Expand Down

0 comments on commit 1d73f36

Please sign in to comment.