Merge pull request #3375 from pandamicro/editbox

Fix issues when orientation changing and screen resize

Author: pandamicro

cocos2d/core/platform/CCEGLView.js

@@ -331,7 +331,9 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
             cc.container.style.transformOrigin = '0px 0px 0px';
             this._isRotated = true;
         }
-        this._orientationChanging = false;
+        setTimeout(function () {
+            cc.view._orientationChanging = false;
+        }, 1000);
     },
 
     // hack

extensions/editbox/CCEditBox.js

@@ -263,6 +263,8 @@ cc.EditBox = cc.ControlButton.extend({
         tmpEdTxt.style.active = 0;
         tmpEdTxt.style.outline = "medium";
         tmpEdTxt.style.padding = "0";
+
+        this.__fullscreen = false;
         var onCanvasClick = function() { this._edTxt.blur();};
         this._onCanvasClick = onCanvasClick.bind(this);
 
@@ -282,6 +284,15 @@ cc.EditBox = cc.ControlButton.extend({
         };
         this._keyPressEvent = keypressEvent.bind(this);
         var focusEvent = function () {
+            // Exit fullscreen
+            if(cc.view.isAutoFullScreenEnabled()) {
+                this.__fullscreen = true;
+                cc.view.enableAutoFullScreen(false);
+                cc.screen.exitFullScreen();
+            } else {
+                this.__fullscreen = false;
+            }
+
             if (this._edTxt.value === this._placeholderText) {
                 this._edTxt.value = "";
                 this._edTxt.style.fontSize = this._edFontSize + "px";
@@ -297,6 +308,11 @@ cc.EditBox = cc.ControlButton.extend({
         };
         this._focusEvent = focusEvent.bind(this);
         var blurEvent = function () {
+            // Resume fullscreen logic
+            if(this.__fullscreen) {
+                cc.view.enableAutoFullScreen(true);
+            }
+
             if (this._edTxt.value === "") {
                 this._edTxt.value = this._placeholderText;
                 this._edTxt.style.fontSize = this._placeholderFontSize + "px";

extensions/spine/Spine.js

@@ -1857,7 +1857,7 @@ spine.SkeletonJson.prototype = {
             }
 
             slotData.attachmentName = slotMap["attachment"];
-            slotData.blendMode = spine.AttachmentType[slotMap["blend"] || "normal"];
+            slotData.blendMode = spine.BlendMode[slotMap["blend"] || "normal"];
 
             skeletonData.slots.push(slotData);
         }