jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

new line characters and doc update

Browse source
This commit is contained in:
Krzysztof Opalka 2013-05-08 18:04:59 +02:00
parent 8027a40e06
commit 15a9019f68
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pixi/text/BitmapText.js
View file

@ -3,7 +3,7 @@
*/ */
/** /**
* A Text Object will create a line(s) of text using bitmap font * A Text Object will create a line(s) of text using bitmap font. To split a line you can use "\n", "\r" or "\r\n"
* You can generate the fnt files using * You can generate the fnt files using
* http://www.angelcode.com/products/bmfont/ for windows or * http://www.angelcode.com/products/bmfont/ for windows or
* http://www.bmglyph.com/ for mac. * http://www.bmglyph.com/ for mac.
@ -32,7 +32,7 @@ PIXI.BitmapText.prototype = Object.create(PIXI.DisplayObjectContainer.prototype)
/** /**
* Set the copy for the text object * Set the copy for the text object
* @methos setText * @method setText
* @param {String} text The copy that you would like the text to display * @param {String} text The copy that you would like the text to display
*/ */
PIXI.BitmapText.prototype.setText = function(text) PIXI.BitmapText.prototype.setText = function(text)
@ -78,7 +78,7 @@ PIXI.BitmapText.prototype.updateText = function()
for(var i = 0; i < this.text.length; i++) for(var i = 0; i < this.text.length; i++)
{ {
var charCode = this.text.charCodeAt(i); var charCode = this.text.charCodeAt(i);
if(charCode == "\n".charCodeAt(0)) if(/(?:\r\n|\r|\n)/.test(this.text.charAt(i)))
{ {
lineWidths.push(pos.x); lineWidths.push(pos.x);
maxLineWidth = Math.max(maxLineWidth, pos.x); maxLineWidth = Math.max(maxLineWidth, pos.x);

9
src/pixi/text/Text.js
View file

@ -3,7 +3,7 @@
*/ */
/** /**
* A Text Object will create a line(s) of text to split a line you can use "\n" * A Text Object will create a line(s) of text. To split a line you can use "\n", "\r" or "\r\n"
* @class Text * @class Text
* @extends Sprite * @extends Sprite
* @constructor * @constructor
@ -54,7 +54,7 @@ PIXI.Text.prototype.setStyle = function(style)
/** /**
* Set the copy for the text object. To split a line you can use "\n" * Set the copy for the text object. To split a line you can use "\n"
* @methos setText * @method setText
* @param {String} text The copy that you would like the text to display * @param {String} text The copy that you would like the text to display
*/ */
PIXI.Sprite.prototype.setText = function(text) PIXI.Sprite.prototype.setText = function(text)
@ -72,7 +72,7 @@ PIXI.Text.prototype.updateText = function()
this.context.font = this.style.font; this.context.font = this.style.font;
//split text into lines //split text into lines
var lines = this.text.split("\n"); var lines = this.text.split(/(?:\r\n|\r|\n)/);
//calculate text width //calculate text width
var lineWidths = []; var lineWidths = [];
@ -154,9 +154,10 @@ PIXI.Text.prototype.updateTransform = function()
PIXI.Sprite.prototype.updateTransform.call(this); PIXI.Sprite.prototype.updateTransform.call(this);
}; };
/* /**
* http://stackoverflow.com/users/34441/ellisbben * http://stackoverflow.com/users/34441/ellisbben
* great solution to the problem! * great solution to the problem!
* @private
*/ */
PIXI.Text.prototype.determineFontHeight = function(fontStyle) PIXI.Text.prototype.determineFontHeight = function(fontStyle)
{ {