Merge pull request #1135 from xingsenma/develop

fixed #2806: Correct the errors of Tests for Cocos2d-Html5 releasing

Author: dingpinglv

cocos2d/label_nodes/CCLabelTTF.js

@@ -903,7 +903,6 @@ else
 
 cc.LabelTTF.__labelHeightDiv = document.createElement("div");
 cc.LabelTTF.__labelHeightDiv.style.fontFamily = "Arial";
-cc.LabelTTF.__labelHeightDiv.innerHTML = "ajghl~!";
 cc.LabelTTF.__labelHeightDiv.style.position = "absolute";
 cc.LabelTTF.__labelHeightDiv.style.left = "-100px";
 cc.LabelTTF.__labelHeightDiv.style.top = "-100px";
@@ -914,10 +913,12 @@ cc.LabelTTF.__getFontHeightByDiv = function(fontName, fontSize){
     var clientHeight = cc.LabelTTF.__fontHeightCache[fontName + "." + fontSize];
     if (clientHeight > 0) return clientHeight;
     var labelDiv = cc.LabelTTF.__labelHeightDiv;
+    labelDiv.innerHTML = "ajghl~!";
     labelDiv.style.fontFamily = fontName;
     labelDiv.style.fontSize = fontSize + "px";
     clientHeight = labelDiv.clientHeight ;
     cc.LabelTTF.__fontHeightCache[fontName + "." + fontSize] = clientHeight;
+    labelDiv.innerHTML = "";
     return clientHeight;
 };
 

extensions/CocoStudio/Armature/utils/CCArmatureDefine.js

@@ -33,4 +33,4 @@ cc.armatureVersion = function(){
     return "0.4.0.0";
 };
 
-cc.RESOURCE_TYPE.TEXT.push("ExportJson");
+cc.RESOURCE_TYPE["TEXT"].push("ExportJson");