Skip to content

Fixed some CCLabelBMFont issues #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moadib wants to merge 1 commit into from
Closed

Fixed some CCLabelBMFont issues #844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions cocos2d/label_nodes/CCLabelBMFont.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ cc.BMFontConfiguration = cc.Class.extend(/** @lends cc.BMFontConfiguration# */{
this._parseCommonArguments(line);
}

re = /page id=[a-zA-Z0-9\.\-= ",]+/gi;
re = /page id=[a-zA-Z0-9_\.\-= ",]+/gi;
line = re.exec(data)[0];
if (line) {
this._parseImageFileName(line, controlFile);
Expand Down Expand Up @@ -723,9 +723,9 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
this._string = newString + String.fromCharCode(0);
// if(this._initialString == ""){
this._initialString = newString + String.fromCharCode(0);
//}
this.updateString(fromUpdate);
//}
}
this.updateString(fromUpdate);
},

/**
Expand All @@ -740,9 +740,9 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
* update Label
*/
updateLabel:function () {
if (this._width > 0) {
this.setString(this._initialString, true);
this.setString(this._initialString, true);

if (this._width > 0) {
// Step 1: Make multiline
var stringLength = this._string.length;
var multiline_string = [];
Expand All @@ -755,7 +755,9 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
while (!(characterSprite = this.getChildByTag(j + skip)))
skip++;

//if (!characterSprite.isVisible()) continue;
if (!characterSprite.isVisible())
continue;

if (i >= stringLength)
break;

Expand Down Expand Up @@ -884,7 +886,15 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
if (this._string[ctr].charCodeAt(0) == 10 || this._string[ctr].charCodeAt(0) == 0) {
var lineWidth = 0;
var line_length = last_line.length;

// if last line is empty we must just increase lineNumber and work with next line
if (line_length == 0) {
lineNumber++;
continue;
}

var index = i + line_length - 1 + lineNumber;

if (index < 0) continue;

var lastChar = this.getChildByTag(index);
Expand Down