diff --git a/cocos2d/render-texture/CCRenderTexture.js b/cocos2d/render-texture/CCRenderTexture.js index 97bd77700a..050672a66f 100644 --- a/cocos2d/render-texture/CCRenderTexture.js +++ b/cocos2d/render-texture/CCRenderTexture.js @@ -235,10 +235,10 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ /** * clears the texture with a color - * @param {Number|cc.Rect} r red 0-1 - * @param {Number} g green 0-1 - * @param {Number} b blue 0-1 - * @param {Number} a alpha 0-1 + * @param {Number|cc.Rect} r red 0-255 + * @param {Number} g green 0-255 + * @param {Number} b blue 0-255 + * @param {Number} a alpha 0-255 */ clear: function (r, g, b, a) { this.beginWithClear(r, g, b, a); diff --git a/cocos2d/shape-nodes/CCDrawNode.js b/cocos2d/shape-nodes/CCDrawNode.js index d0843ec6b6..48caafa13f 100644 --- a/cocos2d/shape-nodes/CCDrawNode.js +++ b/cocos2d/shape-nodes/CCDrawNode.js @@ -530,6 +530,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () { }, onEnter: function () { + cc.Node.prototype.onEnter.call(this); if (this._occupiedSize < this._bufferCapacity) { this._ensureCapacity(this._bufferCapacity); } @@ -539,6 +540,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () { if (!this.manualRelease) { this.release(); } + cc.Node.prototype.onExit.call(this); }, release: function () { diff --git a/extensions/editbox/CCEditBox.js b/extensions/editbox/CCEditBox.js index 3f271550f5..5fa8044506 100644 --- a/extensions/editbox/CCEditBox.js +++ b/extensions/editbox/CCEditBox.js @@ -849,7 +849,7 @@ cc.EditBox.create = function (size, normal9SpriteBg, press9SpriteBg, disabled9Sp } if (editBox._delegate && editBox._delegate.editBoxTextChanged) { - if (editBox._text.toLowerCase() !== this.value.toLowerCase()) { + if (editBox._text !== this.value) { editBox._text = this.value; thisPointer._updateDomTextCases(); editBox._delegate.editBoxTextChanged(editBox, editBox._text);