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

Author: xingsenma

cocos2d/label_nodes/CCLabelTTF.js

@@ -1439,11 +1439,17 @@ cc.LabelTTF.__labelHeightDiv.style.lineHeight = "normal";
 document.body.appendChild(cc.LabelTTF.__labelHeightDiv);
 
 cc.LabelTTF.__getFontHeightByDiv = function(fontName, fontSize){
+    var clientHeight = cc.LabelTTF.__fontHeightCache[fontName + "." + fontSize];
+    if (clientHeight > 0) return clientHeight;
     var labelDiv = cc.LabelTTF.__labelHeightDiv;
     labelDiv.style.fontFamily = fontName;
     labelDiv.style.fontSize = fontSize + "px";
-    return labelDiv.clientHeight ;
+    clientHeight = labelDiv.clientHeight ;
+    cc.LabelTTF.__fontHeightCache[fontName + "." + fontSize] = clientHeight;
+    return clientHeight;
 };
 
+cc.LabelTTF.__fontHeightCache = {};
+
 
 

extensions/GUI/CCScrollView/CCTableView.js

@@ -376,6 +376,7 @@ cc.TableView = cc.ScrollView.extend({
      * reloads data from data source.  the view will be refreshed.
      */
     reloadData:function () {
+        this._oldDirection = cc.SCROLLVIEW_DIRECTION_NONE;
         var locCellsUsed = this._cellsUsed;
         for (var i = 0; i < locCellsUsed.count(); i++) {
             var cell = locCellsUsed.objectAtIndex(i);