Merge pull request #2423 from joshuastray/labelttf

dingpinglv · dingpinglv · commit 4b73d417b5f0 · 2014-10-30T10:47:59.000+08:00
Fixed LabelTTF#_updateString bug
diff --git a/cocos2d/core/labelttf/CCLabelTTF.js b/cocos2d/core/labelttf/CCLabelTTF.js
@@ -596,6 +596,9 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
         }
     },
     _updateString: function () {
+        if ((!this._string || this._string === "") && this._string !== this._originalText)
+            cc.renderer.childrenOrderDirty = true;
+
         this._string = this._originalText;
     },
 

Original file line number	Diff line number	Diff line change
`@@ -596,6 +596,9 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{`
`596`	`596`	`}`
`597`	`597`	`},`
`598`	`598`	`_updateString: function () {`
	`599`	`+ if ((!this._string \|\| this._string === "") && this._string !== this._originalText)`
	`600`	`+ cc.renderer.childrenOrderDirty = true;`
	`601`	`+`
`599`	`602`	`this._string = this._originalText;`
`600`	`603`	`},`
`601`	`604`