Skip to content

Commit ef6f9a4

Browse files
committed
fixed #2806: Correct the errors of CCLabelTTF that labelHeightDiv show on uc browser.
1 parent d00dbaa commit ef6f9a4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cocos2d/label_nodes/CCLabelTTF.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,6 @@ else
903903

904904
cc.LabelTTF.__labelHeightDiv = document.createElement("div");
905905
cc.LabelTTF.__labelHeightDiv.style.fontFamily = "Arial";
906-
cc.LabelTTF.__labelHeightDiv.innerHTML = "ajghl~!";
907906
cc.LabelTTF.__labelHeightDiv.style.position = "absolute";
908907
cc.LabelTTF.__labelHeightDiv.style.left = "-100px";
909908
cc.LabelTTF.__labelHeightDiv.style.top = "-100px";
@@ -914,10 +913,12 @@ cc.LabelTTF.__getFontHeightByDiv = function(fontName, fontSize){
914913
var clientHeight = cc.LabelTTF.__fontHeightCache[fontName + "." + fontSize];
915914
if (clientHeight > 0) return clientHeight;
916915
var labelDiv = cc.LabelTTF.__labelHeightDiv;
916+
labelDiv.innerHTML = "ajghl~!";
917917
labelDiv.style.fontFamily = fontName;
918918
labelDiv.style.fontSize = fontSize + "px";
919919
clientHeight = labelDiv.clientHeight ;
920920
cc.LabelTTF.__fontHeightCache[fontName + "." + fontSize] = clientHeight;
921+
labelDiv.innerHTML = "";
921922
return clientHeight;
922923
};
923924

0 commit comments

Comments
 (0)