Skip to content

Commit e102082

Browse files
authored
Merge pull request cocos2d#3376 from pandamicro/editbox
More adaptive ccui.Button API
2 parents 0765fc0 + 1087bb4 commit e102082

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Diff for: extensions/ccui/uiwidgets/UIButton.js

+9
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
254254
break;
255255
case ccui.Widget.PLIST_TEXTURE:
256256
//SetTexture cannot load resource
257+
if (normal[0] === "#") {
258+
normal = normal.substr(1, normal.length - 1);
259+
}
257260
normalRenderer.initWithSpriteFrameName(normal);
258261
break;
259262
default:
@@ -303,6 +306,9 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
303306
break;
304307
case ccui.Widget.PLIST_TEXTURE:
305308
//SetTexture cannot load resource
309+
if (selected[0] === "#") {
310+
selected = selected.substr(1, selected.length - 1);
311+
}
306312
clickedRenderer.initWithSpriteFrameName(selected);
307313
break;
308314
default:
@@ -348,6 +354,9 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
348354
break;
349355
case ccui.Widget.PLIST_TEXTURE:
350356
//SetTexture cannot load resource
357+
if (disabled[0] === "#") {
358+
disabled = disabled.substr(1, disabled.length - 1);
359+
}
351360
disabledRenderer.initWithSpriteFrameName(disabled);
352361
break;
353362
default:

0 commit comments

Comments
 (0)