Fix a bunch of issues

Author: pandamicro

cocos2d/core/CCDirector.js

@@ -183,7 +183,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     convertToGL: function (uiPoint) {
         var docElem = document.documentElement;
         var view = cc.view;
-        var box = element.getBoundingClientRect();
+        var box = docElem.getBoundingClientRect();
         box.left += window.pageXOffset - docElem.clientLeft;
         box.top += window.pageYOffset - docElem.clientTop;
         var x = view._devicePixelRatio * (uiPoint.x - box.left);
@@ -202,7 +202,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     convertToUI: function (glPoint) {
         var docElem = document.documentElement;
         var view = cc.view;
-        var box = element.getBoundingClientRect();
+        var box = docElem.getBoundingClientRect();
         box.left += window.pageXOffset - docElem.clientLeft;
         box.top += window.pageYOffset - docElem.clientTop;
         var uiPoint = {x: 0, y: 0};

cocos2d/core/base-nodes/CCNode.js

@@ -2015,7 +2015,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
     updateTransform: function () {
         var children = this._children, node;
         for (var i = 0; i < children.length; i++) {
-            varnode = children[i];
+            var node = children[i];
             if (node)
                 node.updateTransform();
         }

cocos2d/core/layers/CCLayer.js

@@ -247,7 +247,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
         return true;
     },
 
-    visit: function () {
+    visit: function (parent) {
         // quick return if not visible
         if (!this._visible)
             return;

cocos2d/core/scenes/CCLoaderScene.js

@@ -33,6 +33,7 @@
 cc.LoaderScene = cc.Scene.extend({
     _interval : null,
     _label : null,
+    _logo : null,
     _className:"LoaderScene",
     cb: null,
     target: null,
@@ -132,7 +133,7 @@ cc.LoaderScene = cc.Scene.extend({
         this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
         this._bgLayer._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
         this._label._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
-        this._logo._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
+        this._logo && this._logo._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
     }
 });
 /**

cocos2d/core/sprites/CCSpriteFrameCache.js

@@ -169,7 +169,7 @@ cc.spriteFrameCache = /** @lends cc.spriteFrameCache# */{
             var frame = frames[key];
             var spriteFrame = spriteFrames[key];
             if (!spriteFrame) {
-                spriteFrame = new cc.SpriteFrame(texture, frame.rect, frame.rotated, frame.offset, frame.size);
+                spriteFrame = new cc.SpriteFrame(texture, cc.rect(frame.rect), frame.rotated, frame.offset, frame.size);
                 var aliases = frame.aliases;
                 if (aliases) {//set aliases
                     for (var i = 0, li = aliases.length; i < li; i++) {

cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js

@@ -235,10 +235,12 @@
             node._texture = texture;
 
             // Update texture rect and blend func
-            var texSize = texture._contentSize;
-            var rect = cc.rect(0, 0, texSize.width, texSize.height);
-            node.setTextureRect(rect);
-            this._updateBlendFunc();
+            if (texture) {
+                var texSize = texture._contentSize;
+                var rect = cc.rect(0, 0, texSize.width, texSize.height);
+                node.setTextureRect(rect);
+                this._updateBlendFunc();
+            }
 
             if (node._textureLoaded) {
                 // Force refresh the render command list

extensions/cocostudio/loader/parsers/timelineParser-2.x.js

@@ -1078,18 +1078,18 @@
      * @returns {ccui.TextBMFont}
      */
     parser.initTextBMFont = function (json, resourcePath) {
-
         var widget = new ccui.TextBMFont();
         this.widgetAttributes(widget, json);
 
-        var text = json["LabelText"];
-        widget.setString(text);
-
         loadTexture(json["LabelBMFontFile_CNB"], resourcePath, function (path, type) {
             if (!cc.loader.getRes(path))
                 cc.log("%s need to be pre loaded", path);
             widget.setFntFile(path);
         });
+
+        var text = json["LabelText"];
+        widget.setString(text);
+
         widget.ignoreContentAdaptWithSize(true);
         return widget;
     };