Merge pull request cocos2d#3167 from pandamicro/develop

Fix cc.view.setRealPixelResolution with all policies

Author: pandamicro

CCBoot.js

@@ -1962,7 +1962,7 @@ function _load(config) {
             var modules = config["modules"] || [];
             var moduleMap = modulesJson["module"];
             var jsList = [];
-            if (cc.sys.supportWebGL && modules.indexOf("base4webgl") < 0) modules.splice(0, 0, "base4webgl");
+            if (cc.sys.capabilities["opengl"] && modules.indexOf("base4webgl") < 0) modules.splice(0, 0, "base4webgl");
             else if (modules.indexOf("core") < 0) modules.splice(0, 0, "core");
             for (var i = 0, li = modules.length; i < li; i++) {
                 var arr = _getJsListOfModule(moduleMap, modules[i], engineDir);
@@ -2135,7 +2135,7 @@ cc.game = /** @lends cc.game# */{
         if (this._paused) return;
         this._paused = true;
         // Pause audio engine
-        cc.audioEngine._pausePlaying();
+        cc.audioEngine && cc.audioEngine._pausePlaying();
         // Pause main loop
         if (this._intervalId)
             window.cancelAnimationFrame(this._intervalId);
@@ -2149,7 +2149,7 @@ cc.game = /** @lends cc.game# */{
         if (!this._paused) return;
         this._paused = false;
         // Resume audio engine
-        cc.audioEngine._resumePlaying();
+        cc.audioEngine && cc.audioEngine._resumePlaying();
         // Resume main loop
         this._runMainLoop();
     },

cocos2d/core/platform/CCEGLView.js

@@ -302,20 +302,20 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
 
     _setViewportMeta: function (metas, overwrite) {
         var vp = document.getElementById("cocosMetaElement");
-        if(vp){
+        if(vp && overwrite){
             document.head.removeChild(vp);
         }
 
         var elems = document.getElementsByName("viewport"),
             currentVP = elems ? elems[0] : null,
             content, key, pattern;
 
-        vp = document.createElement("meta");
+        content = currentVP ? currentVP.content : "";
+        vp = vp || document.createElement("meta");
         vp.id = "cocosMetaElement";
         vp.name = "viewport";
         vp.content = "";
 
-        content = currentVP ? currentVP.content : "";
         for (key in metas) {
             if (content.indexOf(key) == -1) {
                 content += "," + key + "=" + metas[key];
@@ -698,7 +698,6 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
 
         // Set body width to the exact pixel resolution
         document.body.style.width = width + "px";
-        document.body.style.height = "100%";
         document.body.style.left = "0px";
         document.body.style.top = "0px";
 
@@ -1309,4 +1308,4 @@ cc.ResolutionPolicy.FIXED_WIDTH = 4;
  * @static
  * Unknow policy
  */
-cc.ResolutionPolicy.UNKNOWN = 5;
+cc.ResolutionPolicy.UNKNOWN = 5;