Merge pull request #3470 from pandamicro/develop

Refactor Editbox to have better user experience and some issue fix

Author: pandamicro

CCBoot.js

@@ -1758,8 +1758,8 @@ var _initSys = function () {
     sys.browserVersion = "";
     /* Determine the browser version number */
     (function(){
-        var versionReg1 = /(micromessenger|mqqbrowser|qq|maxthon|baidu|sogou)(mobile)?(browser)?\/?([\d.]+)/i;
-        var versionReg2 = /(msie |rv:|firefox|chrome|ucbrowser|oupeng|opera|opr|safari|miui)(mobile)?(browser)?\/?([\d.]+)/i;
+        var versionReg1 = /(mqqbrowser|micromessenger|sogou|qzone|liebao|maxthon|baidu)(mobile)?(browser)?\/?([\d.]+)/i;
+        var versionReg2 = /(msie |rv:|firefox|chrome|ucbrowser|qq|oupeng|opera|opr|safari|miui)(mobile)?(browser)?\/?([\d.]+)/i;
         var tmp = ua.match(versionReg1);
         if(!tmp) tmp = ua.match(versionReg2);
         sys.browserVersion = tmp ? tmp[4] : "";

cocos2d/core/platform/CCEGLView.js

@@ -37,7 +37,7 @@ cc.DENSITYDPI_LOW = "low-dpi";
 
 var __BrowserGetter = {
     init: function () {
-        this.html = document.getElementsByTagName("html")[0];
+        this.html = document.documentElement;
     },
     availWidth: function (frame) {
         if (!frame || frame === this.html)
@@ -66,25 +66,11 @@ if (cc.sys.os === cc.sys.OS_IOS) // All browsers are WebView
 switch (__BrowserGetter.adaptationType) {
     case cc.sys.BROWSER_TYPE_SAFARI:
         __BrowserGetter.meta["minimal-ui"] = "true";
-        __BrowserGetter.availWidth = function (frame) {
-            return frame.clientWidth;
-        };
-        __BrowserGetter.availHeight = function (frame) {
-            return frame.clientHeight;
-        };
         break;
     case cc.sys.BROWSER_TYPE_CHROME:
         __BrowserGetter.__defineGetter__("target-densitydpi", function () {
             return cc.view._targetDensityDPI;
         });
-    case cc.sys.BROWSER_TYPE_SOUGOU:
-    case cc.sys.BROWSER_TYPE_UC:
-        __BrowserGetter.availWidth = function (frame) {
-            return frame.clientWidth;
-        };
-        __BrowserGetter.availHeight = function (frame) {
-            return frame.clientHeight;
-        };
         break;
     case cc.sys.BROWSER_TYPE_MIUI:
         __BrowserGetter.init = function (view) {
@@ -318,9 +304,11 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
         orientation = orientation & cc.ORIENTATION_AUTO;
         if (orientation && this._orientation !== orientation) {
             this._orientation = orientation;
-            var designWidth = this._originalDesignResolutionSize.width;
-            var designHeight = this._originalDesignResolutionSize.height;
-            this.setDesignResolutionSize(designWidth, designHeight, this._resolutionPolicy);
+            if (this._resolutionPolicy) {
+                var designWidth = this._originalDesignResolutionSize.width;
+                var designHeight = this._originalDesignResolutionSize.height;
+                this.setDesignResolutionSize(designWidth, designHeight, this._resolutionPolicy);
+            }
         }
     },
 
@@ -342,7 +330,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
         var h = __BrowserGetter.availHeight(this._frame);
         var isLandscape = w >= h;
 
-        if (!this._orientationChanging || !cc.sys.isMobile ||
+        if (!cc.sys.isMobile ||
             (isLandscape && this._orientation & cc.ORIENTATION_LANDSCAPE) ||
             (!isLandscape && this._orientation & cc.ORIENTATION_PORTRAIT)) {
             locFrameSize.width = w;
@@ -577,17 +565,10 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
         this._frameSize.height = height;
         this._frame.style.width = width + "px";
         this._frame.style.height = height + "px";
-        //this.centerWindow();
         this._resizeEvent();
         cc.director.setProjection(cc.director.getProjection());
     },
 
-    /**
-     * Empty function
-     */
-    centerWindow: function () {
-    },
-
     /**
      * Returns the visible area size of the view port.
      * @return {cc.Size}
@@ -697,6 +678,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
 
         // Permit to re-detect the orientation of device.
         this._orientationChanging = true;
+        // If resizing, then frame size is already initialized, this logic should be improved
         if (!this._resizing)
             this._initFrameSize();
 
@@ -850,13 +832,13 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
             var boxArr = gl.getParameter(gl.SCISSOR_BOX);
             _scissorRect = cc.rect(boxArr[0], boxArr[1], boxArr[2], boxArr[3]);
         }
-        var scaleX = this._scaleX;
-        var scaleY = this._scaleY;
+        var scaleXFactor = 1 / this._scaleX;
+        var scaleYFactor = 1 / this._scaleY;
         return cc.rect(
-            (_scissorRect.x - this._viewPortRect.x) / scaleX,
-            (_scissorRect.y - this._viewPortRect.y) / scaleY,
-            _scissorRect.width / scaleX,
-            _scissorRect.height / scaleY
+            (_scissorRect.x - this._viewPortRect.x) * scaleXFactor,
+            (_scissorRect.y - this._viewPortRect.y) * scaleYFactor,
+            _scissorRect.width * scaleXFactor,
+            _scissorRect.height * scaleYFactor
         );
     },
 
@@ -1106,7 +1088,7 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{
             this._setupContainer(view, view._frameSize.width, view._frameSize.height);
             // Setup container's margin and padding
             if (view._isRotated) {
-                containerStyle.marginLeft = frameH + 'px';
+                containerStyle.margin = '0 0 0 ' + frameH + 'px';
             }
             else {
                 containerStyle.margin = '0px';
@@ -1136,7 +1118,7 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{
             this._setupContainer(view, containerW, containerH);
             // Setup container's margin and padding
             if (view._isRotated) {
-                containerStyle.marginLeft = frameH + 'px';
+                containerStyle.margin = '0 0 0 ' + frameH + 'px';
             }
             else {
                 containerStyle.margin = '0px';

cocos2d/core/renderer/RendererCanvas.js

@@ -163,9 +163,9 @@ cc.rendererCanvas = {
 
         ctx.setTransform(1, 0, 0, 1, 0, 0);
         ctx.clearRect(0, 0, viewport.width, viewport.height);
-        if (this._clearColor.r !== 0 ||
-            this._clearColor.g !== 0 ||
-            this._clearColor.b !== 0) {
+        if (this._clearColor.r !== 255 ||
+            this._clearColor.g !== 255 ||
+            this._clearColor.b !== 255) {
             wrapper.setFillStyle(this._clearFillStyle);
             wrapper.setGlobalAlpha(this._clearColor.a);
             ctx.fillRect(0, 0, viewport.width, viewport.height);