Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2421_TextureRepeating

dingpinglv · dingpinglv · commit 769c5085a1dd · 2014-10-30T17:22:43.000+08:00
diff --git a/cocos2d/core/labelttf/CCLabelTTF.js b/cocos2d/core/labelttf/CCLabelTTF.js
@@ -847,6 +847,10 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
             }
 
             fuzzyLen -= pushNum;
+            if(fuzzyLen === 0){
+                fuzzyLen = 1;
+                sLine = sLine.substr(1);
+            }
 
             var sText = text.substr(0, fuzzyLen);
 

Original file line number	Diff line number	Diff line change
`@@ -847,6 +847,10 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{`
`847`	`847`	`}`
`848`	`848`
`849`	`849`	`fuzzyLen -= pushNum;`
	`850`	`+ if(fuzzyLen === 0){`
	`851`	`+ fuzzyLen = 1;`
	`852`	`+ sLine = sLine.substr(1);`
	`853`	`+ }`
`850`	`854`
`851`	`855`	`var sText = text.substr(0, fuzzyLen);`
`852`	`856`