[ci skip] Improve js template and update web ref (#17510)

* Improve js templates * Update web ref
cocos2d · Mar 16, 2017 · f0061c3 · f0061c3
1 parent 75383bd
commit f0061c3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git a/templates/js-template-default/index.html b/templates/js-template-default/index.html
@@ -90,25 +90,6 @@
 <body>
 <script src="res/loading.js"></script>
 <canvas id="gameCanvas" width="480" height="720"></canvas>
-<script>
-    (function () {
-        var nav = window.navigator;
-        var ua = nav.userAgent.toLowerCase();
-        var uaResult = /android (\d+(?:\.\d+)+)/i.exec(ua) || /android (\d+(?:\.\d+)+)/i.exec(nav.platform);
-        if (uaResult) {
-            var browserCheck = ua.match(/(qzone|micromessenger|qq)(mobile)?(browser)?\/?([\d.]+)/i);
-            if (browserCheck) {
-                var browserVersion = parseFloat(browserCheck[4] || 0);
-                if (browserVersion < 6.2) {
-                    var gameCanvas = document.getElementById("gameCanvas");
-                    var ctx = gameCanvas.getContext('2d');
-                    ctx.fillStyle = '#000000';
-                    ctx.fillRect(0, 0, 1, 1);
-                }
-            }
-        }
-    })();
-</script>
 <script src="frameworks/cocos2d-html5/CCBoot.js"></script>
 <script cocos src="main.js"></script>
 </body>

diff --git a/templates/js-template-default/main.js b/templates/js-template-default/main.js
@@ -53,11 +53,19 @@
  */
 
 cc.game.onStart = function(){
-    if(!cc.sys.isNative && document.getElementById("cocosLoading")) //If referenced loading.js, please remove it
+    var sys = cc.sys;
+    if(!sys.isNative && document.getElementById("cocosLoading")) //If referenced loading.js, please remove it
         document.body.removeChild(document.getElementById("cocosLoading"));
 
     // Pass true to enable retina display, on Android disabled by default to improve performance
-    cc.view.enableRetina(cc.sys.os === cc.sys.OS_IOS ? true : false);
+    cc.view.enableRetina(sys.os === sys.OS_IOS ? true : false);
+
+    // Disable auto full screen on baidu and wechat, you might also want to eliminate sys.BROWSER_TYPE_MOBILE_QQ
+    if (sys.isMobile && 
+        sys.browserType !== sys.BROWSER_TYPE_BAIDU &&
+        sys.browserType !== sys.BROWSER_TYPE_WECHAT) {
+        cc.view.enableAutoFullScreen(true);
+    }
 
     // Adjust viewport meta
     cc.view.adjustViewPort(true);

diff --git a/tests/js-tests/main.js b/tests/js-tests/main.js
@@ -85,7 +85,7 @@
  *
  */
 
-if(cc.sys){
+if (cc.sys && cc.sys.isNative) {
     var scene3SearchPaths = cc.sys.localStorage.getItem("Scene3SearchPaths");
     if (scene3SearchPaths)
         jsb.fileUtils.setSearchPaths(JSON.parse(scene3SearchPaths));

diff --git a/web b/web