Fixed cocos2d#3568: Correct a bug that it can't see the progress text when contentScaleFactor sets.

Author: dingpinglv

cocos2d/core/CCLoader.js

@@ -450,7 +450,7 @@ cc.LoaderScene = cc.Scene.extend(/** @lends cc.LoaderScene# */{
         this._texture2d.initWithElement(this._logoTexture);
         this._texture2d.handleLoadedTexture();
         this._logo = cc.Sprite.createWithTexture(this._texture2d);
-
+        this._logo.setScale(cc.CONTENT_SCALE_FACTOR());
         this._logo.setPosition(centerPos);
         this._bgLayer.addChild(this._logo, 10);
     },

cocos2d/label_nodes/CCLabelBMFont.js

@@ -1262,10 +1262,10 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
 });
 
 /**
- * creates a bitmap font altas with an initial string and the FNT file
+ * creates a bitmap font atlas with an initial string and the FNT file
  * @param {String} str
  * @param {String} fntFile
- * @param {String} width
+ * @param {Number} width
  * @param {Number} alignment
  * @param {cc.Point} imageOffset
  * @return {cc.LabelBMFont|Null}
@@ -1282,9 +1282,8 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
 cc.LabelBMFont.create = function (str, fntFile, width, alignment, imageOffset) {
     var ret = new cc.LabelBMFont();
     if (arguments.length == 0) {
-        if (ret && ret.init()) {
+        if (ret && ret.init())
             return ret;
-        }
         return null;
     }
 

cocos2d/menu_nodes/CCMenuItem.js

@@ -389,8 +389,8 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{
 
 /**
  * @param {cc.Node} label
- * @param {function|String|Null} selector
- * @param {cc.Node|Null} target
+ * @param {function|String|Null} [selector=]
+ * @param {cc.Node|Null} [target=]
  * @return {cc.MenuItemLabel}
  */
 cc.MenuItemLabel.create = function (label, selector, target) {