Merge pull request #1891 from pandamicro/v1.6

Small improvements
This commit is contained in:
pandamicro
2017-08-08 14:27:05 +08:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -526,7 +526,7 @@ var Label = cc.Class({
}
} else {
cc.warnID(4011, font.name);
sgNode = this._sgNode = new _ccsg.Label(this.string);
sgNode = this._sgNode = _ccsg.Label.pool.get(this.string);
}
} else {
sgNode = this._sgNode = _ccsg.Label.pool.get(this.string, font, null, this._fontSize);
+3 -3
View File
@@ -140,7 +140,7 @@ window.setTimeout = function (code, delay, ...args) {
original.call(this);
clearTimeout(target._intervalId);
};
cc.director.getScheduler()._schedule(target.fun, target, delay / 1000, 0, 0, false, target._intervalId+'');
cc.director.getScheduler().schedule(target.fun, target, delay / 1000, 0, 0, false);
_windowTimeFunHash[target._intervalId] = target;
return target._intervalId;
};
@@ -156,7 +156,7 @@ window.setInterval = function (code, delay, ...args) {
if (args.length > 0) {
target._args = args;
}
cc.director.getScheduler()._schedule(target.fun, target, delay / 1000, cc.macro.REPEAT_FOREVER, 0, false, target._intervalId+'');
cc.director.getScheduler().schedule(target.fun, target, delay / 1000, cc.macro.REPEAT_FOREVER, 0, false);
_windowTimeFunHash[target._intervalId] = target;
return target._intervalId;
};
@@ -168,7 +168,7 @@ window.setInterval = function (code, delay, ...args) {
window.clearInterval = function (intervalId) {
var target = _windowTimeFunHash[intervalId];
if (target) {
cc.director.getScheduler()._unschedule(target._intervalId+'', target);
cc.director.getScheduler().unschedule(target.fun, target);
delete _windowTimeFunHash[intervalId];
}
};