Merge pull request cocos2d#1 from zilongshanren/addBMFontSupport

fix a few issues of CCLabel.js

Author: dabingnn

cocos2d/labels/CCLabel.js

@@ -1,3 +1,5 @@
+/*global cc */
+
 /****************************************************************************
  Copyright (c) 2015 Chukong Technologies Inc.
 
@@ -22,7 +24,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-EventTarget = require("../cocos2d/core/event/event-target");
+var EventTarget = require("../cocos2d/core/event/event-target");
 
 cc.Label = cc.Node.extend({
     _hAlign: 0, //0 left, 1 center, 2 right
@@ -31,45 +33,45 @@ cc.Label = cc.Node.extend({
     _fontSize: 20,
     _overFlow: 0, //0 clamp, 1 shrink 2, resize to content
     _isWrapText: true,
-    _spacingX : 0,
-    _spacingY : 0,
+    _spacingX: 0,
+    _spacingY: 0,
 
     _labelSkinDirty: true,
     _labelIsTTF: true,
     _fontHandle: "",
 
     //fontHandle it is a font name or bmfont file.
-    ctor : function(fontHandle, isTTF) {
+    ctor: function(fontHandle, isTTF) {
         fontHandle = fontHandle || "";
         this._fontHandle = fontHandle;
         isTTF = isTTF || true;
         this._labelIsTTF = isTTF;
         cc.Node.prototype.ctor.call(this);
-        this.setContentSize(cc.size(128,128));
+        this.setContentSize(cc.size(128, 128));
     },
 
-    setHorizontalAlign: function (align) {
-        if(this._hAlign === align) return;
+    setHorizontalAlign: function(align) {
+        if (this._hAlign === align) return;
         this._hAlign = align;
         this._notifyLabelSkinDirty();
     },
 
-    getHorizontalAlign: function () {
+    getHorizontalAlign: function() {
         return this._hAlign;
     },
 
-    setVerticalAlign: function (align) {
-        if(this._vAlign === align) return;
+    setVerticalAlign: function(align) {
+        if (this._vAlign === align) return;
         this._vAlign = align;
         this._notifyLabelSkinDirty();
     },
 
-    getVerticalAlign: function () {
+    getVerticalAlign: function() {
         return this._vAlign;
     },
 
     setString: function(string) {
-        if(this._string === string) return;
+        if (this._string === string) return;
         this._string = string;
         this._notifyLabelSkinDirty();
     },
@@ -79,7 +81,7 @@ cc.Label = cc.Node.extend({
     },
 
     enableWrapText: function(enabled) {
-        if(this._isWrapText === enabled) return;
+        if (this._isWrapText === enabled) return;
         this._isWrapText = enabled;
         this._notifyLabelSkinDirty();
     },
@@ -89,7 +91,7 @@ cc.Label = cc.Node.extend({
     },
 
     setFontSize: function(fntSize) {
-        if(this._fontSize === fntSize) return;
+        if (this._fontSize === fntSize) return;
         this._fontSize = fntSize;
         this._notifyLabelSkinDirty();
     },
@@ -99,7 +101,7 @@ cc.Label = cc.Node.extend({
     },
 
     setOverflow: function(overflow) {
-        if(this._overFlow === overflow) return;
+        if (this._overFlow === overflow) return;
         this._overFlow = overflow;
         this._notifyLabelSkinDirty();
     },
@@ -109,14 +111,14 @@ cc.Label = cc.Node.extend({
     },
 
     setSpacingX: function(spacing) {
-        if(this._spacingX === spacing) return;
-        this._spacingX == spacing;
+        if (this._spacingX === spacing) return;
+        this._spacingX = spacing;
         this._notifyLabelSkinDirty();
     },
 
     setSpacingY: function(spacing) {
-        if(this._spacingY === spacing) return;
-        this._spacingY == spacing;
+        if (this._spacingY === spacing) return;
+        this._spacingY = spacing;
         this._notifyLabelSkinDirty();
     },
 
@@ -128,33 +130,43 @@ cc.Label = cc.Node.extend({
         return this._spacingY;
     },
 
-    setContentSize : function(size){
-        if (cc.sizeEqualToSize(this._contentSize,size))
-        {
+    setContentSize: function(size) {
+        if (cc.sizeEqualToSize(this._contentSize, size)) {
             return;
         }
         cc.Node.prototype.setContentSize.call(this, size);
         this._notifyLabelSkinDirty();
     },
 
-    _notifyLabelSkinDirty : function() {
+    _notifyLabelSkinDirty: function() {
         this._labelSkinDirty = true;
         this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.textDirty);
     },
-    _createRenderCmd: function () {
+    _createRenderCmd: function() {
 
-        if(this._labelIsTTF) {
+        if (this._labelIsTTF) {
             if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
                 return new cc.Label.TTFWebGLRenderCmd(this);
             else
                 return new cc.Label.TTFCanvasRenderCmd(this);
-        }
-        else {
+        } else {
             //todo:add label bmfont here
         }
     }
 });
 
-cc.Label.HorizontalAlign = {LEFT: 0, CENTER: 1, RIGHT: 2};
-cc.Label.VerticalAlign = {BOTTOM: 0, CENTER: 1, TOP: 2};
-cc.Label.Overflow = {CLAMP: 0, SHRINK: 1, RESIZE: 2};
+cc.Label.HorizontalAlign = {
+    LEFT: 0,
+    CENTER: 1,
+    RIGHT: 2
+};
+cc.Label.VerticalAlign = {
+    BOTTOM: 0,
+    CENTER: 1,
+    TOP: 2
+};
+cc.Label.Overflow = {
+    CLAMP: 0,
+    SHRINK: 1,
+    RESIZE: 2
+};