Merge pull request cocos2d#1391 from pandamicro/develop

Fixed cocos2d#3371: TMXLayer size set

Author: dingpinglv

cocos2d/tileMap_nodes/CCTMXLayer.js

@@ -131,8 +131,8 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
 
             this._cacheContext.translate(0, locCanvas.height);
             var locTexContentSize = this._cacheTexture._contentSize;
-            locTexContentSize.width = locCanvas.width;
-            locTexContentSize.height = locCanvas.height;
+            locTexContentSize._width = locCanvas.width;
+            locTexContentSize._height = locCanvas.height;
 
             // Init sub caches if needed
             var totalPixel = locCanvas.width * locCanvas.height;

template/main.js

@@ -67,6 +67,7 @@ var cocos2dApp = cc.Application.extend({
         cc.FileUtils.getInstance().setSearchResolutionsOrder(resDirOrders);
         director.setContentScaleFactor(resourceSize.width / designSize.width);
         cc.EGLView.getInstance().setDesignResolutionSize(designSize.width, designSize.height, cc.RESOLUTION_POLICY.SHOW_ALL);
+        cc.EGLView.getInstance()._resizeWithBrowserSize(true);
 
         // turn on display FPS
         director.setDisplayStats(this.config['showFPS']);