Skip to content

Commit bf0908c

Browse files
authored
Merge pull request #3472 from pandamicro/develop
Fix editbox and draw node issue
2 parents 47cb200 + 4013fa7 commit bf0908c

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

cocos2d/render-texture/CCRenderTexture.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
235235

236236
/**
237237
* clears the texture with a color
238-
* @param {Number|cc.Rect} r red 0-1
239-
* @param {Number} g green 0-1
240-
* @param {Number} b blue 0-1
241-
* @param {Number} a alpha 0-1
238+
* @param {Number|cc.Rect} r red 0-255
239+
* @param {Number} g green 0-255
240+
* @param {Number} b blue 0-255
241+
* @param {Number} a alpha 0-255
242242
*/
243243
clear: function (r, g, b, a) {
244244
this.beginWithClear(r, g, b, a);

cocos2d/shape-nodes/CCDrawNode.js

+2
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
530530
},
531531

532532
onEnter: function () {
533+
cc.Node.prototype.onEnter.call(this);
533534
if (this._occupiedSize < this._bufferCapacity) {
534535
this._ensureCapacity(this._bufferCapacity);
535536
}
@@ -539,6 +540,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
539540
if (!this.manualRelease) {
540541
this.release();
541542
}
543+
cc.Node.prototype.onExit.call(this);
542544
},
543545

544546
release: function () {

extensions/editbox/CCEditBox.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ cc.EditBox.create = function (size, normal9SpriteBg, press9SpriteBg, disabled9Sp
849849
}
850850

851851
if (editBox._delegate && editBox._delegate.editBoxTextChanged) {
852-
if (editBox._text.toLowerCase() !== this.value.toLowerCase()) {
852+
if (editBox._text !== this.value) {
853853
editBox._text = this.value;
854854
thisPointer._updateDomTextCases();
855855
editBox._delegate.editBoxTextChanged(editBox, editBox._text);

0 commit comments

Comments
 (0)