Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2698_namespace

Author: dingpinglv

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

@@ -645,6 +645,10 @@
 
         this.widgetAttributes(widget, json);
 
+        loadTexture(json["FileData"], resourcePath, function(path, type){
+            widget.setBackGroundImage(path, type);
+        });
+
         var clipEnabled = json["ClipAble"];
         widget.setClippingEnabled(clipEnabled);
 
@@ -691,10 +695,6 @@
             widget.setBackGroundColorVector(cc.p(colorVectorX, colorVectorY));
         }
 
-        loadTexture(json["FileData"], resourcePath, function(path, type){
-            widget.setBackGroundImage(path, type);
-        });
-
         var innerNodeSize = json["InnerNodeSize"];
         var innerSize = cc.size(
             innerNodeSize["Width"] || 0,
@@ -829,6 +829,10 @@
 
         this.widgetAttributes(widget, json);
 
+        loadTexture(json["FileData"], resourcePath, function(path, type){
+            widget.setBackGroundImage(path, type);
+        });
+
         var clipEnabled = json["ClipAble"] || false;
         widget.setClippingEnabled(clipEnabled);
 
@@ -869,10 +873,6 @@
         if(bgColorOpacity != null)
             widget.setBackGroundColorOpacity(bgColorOpacity);
 
-        loadTexture(json["FileData"], resourcePath, function(path, type){
-            widget.setBackGroundImage(path, type);
-        });
-
         setContentSize(widget, json["Size"]);
 
         return widget;
@@ -891,6 +891,10 @@
 
         this.widgetAttributes(widget, json);
 
+        loadTexture(json["FileData"], resourcePath, function(path, type){
+            widget.setBackGroundImage(path, type);
+        });
+
         var clipEnabled = json["ClipAble"] || false;
         widget.setClippingEnabled(clipEnabled);
 
@@ -964,11 +968,6 @@
         if(bgColorOpacity != null)
             widget.setBackGroundColorOpacity(bgColorOpacity);
 
-
-        loadTexture(json["FileData"], resourcePath, function(path, type){
-            widget.setBackGroundImage(path, type);
-        });
-
         setContentSize(widget, json["Size"]);
 
         return widget;