Merge remote-tracking branch 'refs/remotes/fireball/next'

Conflicts:
	cocos2d/core/renderer/canvas/renderers/utils.js

CCDebugger.js

@@ -106,7 +106,7 @@ cc._initDebugSetting = function (mode) {
     if (mode === cc.DebugMode.NONE)
         return;
 
-    if (!CC_JSB && mode > cc.DebugMode.ERROR) {
+    if (mode > cc.DebugMode.ERROR) {
         //log to web page
 
         function logToWebPage (msg) {

cocos2d/core/CCDirector.js

@@ -556,27 +556,7 @@ cc.Director.prototype = {
             var uuid = info.uuid;
             this.emit(cc.Director.EVENT_BEFORE_SCENE_LOADING, sceneName);
             this._loadingScene = sceneName;
-            if (CC_JSB && cc.runtime && uuid !== this._launchSceneUuid) {
-                var self = this;
-                var groupName = cc.path.basename(info.url) + '_' + info.uuid;
-                console.log('==> start preload: ' + groupName);
-                var ensureAsync = false;
-                cc.LoaderLayer.preload([groupName], function () {
-                    console.log('==> end preload: ' + groupName);
-                    if (ensureAsync) {
-                        self._loadSceneByUuid(uuid, onLaunched, _onUnloaded);
-                    }
-                    else {
-                        setTimeout(function () {
-                            self._loadSceneByUuid(uuid, onLaunched, _onUnloaded);
-                        }, 0);
-                    }
-                });
-                ensureAsync = true;
-            }
-            else {
-                this._loadSceneByUuid(uuid, onLaunched, _onUnloaded);
-            }
+            this._loadSceneByUuid(uuid, onLaunched, _onUnloaded);
             return true;
         }
         else {

cocos2d/core/CCGame.js

@@ -31,7 +31,7 @@ if (!(CC_EDITOR && Editor.isMainProcess)) {
 }
 
 require('../audio/CCAudioEngine');
-var renderer = require('./renderer');
+var renderer = require('./renderer/index.js');
 var inputManager = CC_QQPLAY ? require('./platform/BKInputManager') : require('./platform/CCInputManager');
 
 /**
@@ -695,7 +695,7 @@ var game = {
             isWeChatGame = cc.sys.platform === cc.sys.WECHAT_GAME,
             isQQPlay = cc.sys.platform === cc.sys.QQ_PLAY;
 
-        if (isWeChatGame) {
+        if (isWeChatGame || CC_JSB) {
             this.container = localContainer = document.createElement("DIV");
             this.frame = localContainer.parentNode === document.body ? document.documentElement : localContainer.parentNode;
             this.canvas = localCanvas = canvas;

cocos2d/core/CCNode.js

@@ -162,41 +162,22 @@ var _touchStartHandler = function (touch, event) {
     var node = this.owner;
 
     if (node._hitTest(pos, this)) {
-        if (CC_JSB) {
-            event = Event.EventTouch.pool.get(event);
-        }
         event.type = EventType.TOUCH_START;
         event.touch = touch;
         event.bubbles = true;
         node.dispatchEvent(event);
-        if (CC_JSB) {
-            event.touch = null;
-            event._touches = null;
-            Event.EventTouch.pool.put(event);
-        }
         return true;
     }
     return false;
 };
 var _touchMoveHandler = function (touch, event) {
-    if (CC_JSB) {
-        event = Event.EventTouch.pool.get(event);
-    }
     var node = this.owner;
     event.type = EventType.TOUCH_MOVE;
     event.touch = touch;
     event.bubbles = true;
     node.dispatchEvent(event);
-    if (CC_JSB) {
-        event.touch = null;
-        event._touches = null;
-        Event.EventTouch.pool.put(event);
-    }
 };
 var _touchEndHandler = function (touch, event) {
-    if (CC_JSB) {
-        event = Event.EventTouch.pool.get(event);
-    }
     var pos = touch.getLocation();
     var node = this.owner;
 
@@ -209,60 +190,31 @@ var _touchEndHandler = function (touch, event) {
     event.touch = touch;
     event.bubbles = true;
     node.dispatchEvent(event);
-    if (CC_JSB) {
-        event.touch = null;
-        event._touches = null;
-        Event.EventTouch.pool.put(event);
-    }
 };
 var _touchCancelHandler = function (touch, event) {
-    if (CC_JSB) {
-        event = Event.EventTouch.pool.get(event);
-    }
     var pos = touch.getLocation();
     var node = this.owner;
 
     event.type = EventType.TOUCH_CANCEL;
     event.touch = touch;
     event.bubbles = true;
     node.dispatchEvent(event);
-    if (CC_JSB) {
-        event.touch = null;
-        event._touches = null;
-        Event.EventTouch.pool.put(event);
-    }
 };
 
 var _mouseDownHandler = function (event) {
     var pos = event.getLocation();
     var node = this.owner;
 
     if (node._hitTest(pos, this)) {
-        if (CC_JSB) {
-            // jsb event will be replaced so can be stopped immediately
-            event.stopPropagation();
-            event = Event.EventMouse.pool.get(event);
-        }
         event.type = EventType.MOUSE_DOWN;
         event.bubbles = true;
         node.dispatchEvent(event);
-        if (CC_JSB) {
-            Event.EventMouse.pool.put(event);
-        }
-        else {
-            event.stopPropagation();
-        }
     }
 };
 var _mouseMoveHandler = function (event) {
     var pos = event.getLocation();
     var node = this.owner;
     var hit = node._hitTest(pos, this);
-    if (CC_JSB && (hit || this._previousIn)) {
-        // jsb event will be replaced so can be stopped immediately
-        event.stopPropagation();
-        event = Event.EventMouse.pool.get(event);
-    }
     if (hit) {
         if (!this._previousIn) {
             // Fix issue when hover node switched, previous hovered node won't get MOUSE_LEAVE notification
@@ -292,54 +244,28 @@ var _mouseMoveHandler = function (event) {
     }
 
     // Event processed, cleanup
-    if (CC_JSB) {
-        Event.EventMouse.pool.put(event);
-    }
-    else {
-        event.stopPropagation();
-    }
+    event.stopPropagation();
 };
 var _mouseUpHandler = function (event) {
     var pos = event.getLocation();
     var node = this.owner;
 
     if (node._hitTest(pos, this)) {
-        if (CC_JSB) {
-            // jsb event will be replaced so can be stopped immediately
-            event.stopPropagation();
-            event = Event.EventMouse.pool.get(event);
-        }
         event.type = EventType.MOUSE_UP;
         event.bubbles = true;
         node.dispatchEvent(event);
-        if (CC_JSB) {
-            Event.EventMouse.pool.put(event);
-        }
-        else {
-            event.stopPropagation();
-        }
+        event.stopPropagation();
     }
 };
 var _mouseWheelHandler = function (event) {
     var pos = event.getLocation();
     var node = this.owner;
 
     if (node._hitTest(pos, this)) {
-        //FIXME: separate wheel event and other mouse event.
-        if (CC_JSB) {
-            // jsb event will be replaced so can be stopped immediately
-            event.stopPropagation();
-            event = Event.EventMouse.pool.get(event);
-        }
         event.type = EventType.MOUSE_WHEEL;
         event.bubbles = true;
         node.dispatchEvent(event);
-        if (CC_JSB) {
-            Event.EventMouse.pool.put(event);
-        }
-        else {
-            event.stopPropagation();
-        }
+        event.stopPropagation();
     }
 };
 

cocos2d/core/base-ui/CCWidgetManager.js

@@ -448,17 +448,14 @@ var widgetManager = cc._widgetManager = module.exports = {
         if (CC_EDITOR && cc.engine) {
             cc.engine.on('design-resolution-changed', this.onResized.bind(this));
         }
-        else if (!CC_JSB) {
+        else {
             if (cc.sys.isMobile) {
                 window.addEventListener('resize', this.onResized.bind(this));
             }
             else {
                 cc.eventManager.addCustomListener('canvas-resize', this.onResized.bind(this));
             }
         }
-        else {
-            cc.eventManager.addListener(this.onResized.bind(this), 1);
-        }
     },
     add: function (widget) {
         widget.node._widget = widget;

cocos2d/core/components/CCCanvas.js

@@ -124,16 +124,7 @@ var Canvas = cc.Class({
     },
 
     ctor: function () {
-        if (CC_JSB) {
-            this._thisOnResized = cc.EventListener.create({
-                event: cc.EventListener.CUSTOM,
-                eventName: "window-resize",
-                callback: this.onResized.bind(this)
-            });
-        }
-        else {
-            this._thisOnResized = this.onResized.bind(this);
-        }
+        this._thisOnResized = this.onResized.bind(this);
     },
 
     __preload: function () {
@@ -153,17 +144,14 @@ var Canvas = cc.Class({
         if (CC_EDITOR) {
             cc.engine.on('design-resolution-changed', this._thisOnResized);
         }
-        else if (!CC_JSB) {
+        else {
             if (cc.sys.isMobile) {
                 window.addEventListener('resize', this._thisOnResized);
             }
             else {
                 eventManager.addCustomListener('canvas-resize', this._thisOnResized);
             }
         }
-        else {
-            eventManager.addListener(this._thisOnResized, 1);
-        }
 
         this.applySettings();
         this.onResized();
@@ -191,17 +179,14 @@ var Canvas = cc.Class({
         if (CC_EDITOR) {
             cc.engine.off('design-resolution-changed', this._thisOnResized);
         }
-        else if (!CC_JSB) {
+        else {
             if (cc.sys.isMobile) {
                 window.removeEventListener('resize', this._thisOnResized);
             }
             else {
                 eventManager.removeCustomListeners('canvas-resize', this._thisOnResized);
             }
         }
-        else {
-            eventManager.removeListener(this._thisOnResized);
-        }
 
         if (Canvas.instance === this) {
             Canvas.instance = null;

cocos2d/core/components/CCLabel.js

@@ -343,7 +343,6 @@ var Label = cc.Class({
                 if (value && this._isSystemFontUsed)
                     this._isSystemFontUsed = false;
 
-
                 if ( typeof value === 'string' ) {
                     cc.warnID(4000);
                 }

cocos2d/core/components/CCRichText.js

@@ -65,6 +65,10 @@ var pool = new js.Pool(function (node) {
     if (CC_DEV) {
         cc.assert(!node._parent, 'Recycling node\'s parent should be null!');
     }
+    let Flags = cc.Object.Flags;
+    if (node._objFlags & Flags.Destroyed || node._objFlags & Flags.Destroying) {
+        return false;
+    }
     if (node.getComponent(cc.LabelOutline)) {
         return false;
     }
@@ -202,7 +206,7 @@ var RichText = cc.Class({
                 if (this.font === oldValue) return;
 
                 this._layoutDirty = true;
-                if (!CC_JSB && this.font) {
+                if (this.font) {
                     this._onTTFLoaded();
                 }
                 this._updateRichTextStatus();
@@ -299,9 +303,7 @@ var RichText = cc.Class({
     },
 
     start: function () {
-        if (!CC_JSB) {
-            this._onTTFLoaded();
-        }
+        this._onTTFLoaded();
     },
 
     _addEventListeners: function () {
@@ -426,18 +428,6 @@ var RichText = cc.Class({
         this.node.addChild(labelSegment);
         this._labelSegments.push(labelSegment);
 
-        //when lineHeight is less than the content size of labelSize
-        //in Web platform, the extra pixels will be trimed.
-        //so we need to set the overflow to clamp in JSB
-        //FIXME: label in jsb should be refactored to keep the behavior the same as web platform.
-        if (CC_JSB) {
-            let labelComponent = labelSegment.getComponent(cc.Label);
-            labelComponent.overflow = 1;
-            var size = labelSegment.getContentSize();
-            labelComponent.enableWrapText = false;
-            labelSegment.setDimensions(size.width, this.lineHeight);
-        }
-
         return labelSegment;
     },
 

cocos2d/core/components/editbox/CCEditBox.js

@@ -254,9 +254,7 @@ var EditBox = cc.Class({
             tooltip: CC_DEV && 'i18n:COMPONENT.editbox.stay_on_top',
             default: false,
             notify () {
-                if (!CC_JSB) {
-                    this._updateStayOnTop();
-                }
+                this._updateStayOnTop();
             }
         },
 
@@ -546,10 +544,8 @@ var EditBox = cc.Class({
     },
 
     _registerEvent () {
-        if(!CC_JSB) {
-            this.node.on(cc.Node.EventType.TOUCH_START, this._onTouchBegan, this);
-            this.node.on(cc.Node.EventType.TOUCH_END, this._onTouchEnded, this);
-        }
+        this.node.on(cc.Node.EventType.TOUCH_START, this._onTouchBegan, this);
+        this.node.on(cc.Node.EventType.TOUCH_END, this._onTouchEnded, this);
     },
 
     _onTouchBegan(event) {
@@ -600,16 +596,6 @@ var EditBox = cc.Class({
 
 });
 
-if(CC_JSB) {
-    EditBox.prototype.editBoxEditingDidBegin = function (sender) {
-        this.editBoxEditingDidBegan(sender);
-    };
-
-    EditBox.prototype.editBoxEditingDidEnd = function (sender) {
-        this.editBoxEditingDidEnded(sender);
-    };
-}
-
 cc.EditBox = module.exports = EditBox;
 
 /**