Skip to content

Commit 7adcb66

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents ef66eef + 40818ba commit 7adcb66

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/scene/ScenePlugin.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,15 @@ var ScenePlugin = new Class({
105105
{
106106
if (key === undefined) { key = this.key; }
107107

108-
if (key !== this.key)
108+
if (this.settings.status !== CONST.RUNNING)
109109
{
110-
if (this.settings.status !== CONST.RUNNING)
111-
{
112-
this.manager.queueOp('stop', this.key);
113-
this.manager.queueOp('start', key);
114-
}
115-
else
116-
{
117-
this.manager.stop(this.key);
118-
this.manager.start(key, data);
119-
}
110+
this.manager.queueOp('stop', this.key);
111+
this.manager.queueOp('start', key);
112+
}
113+
else
114+
{
115+
this.manager.stop(this.key);
116+
this.manager.start(key, data);
120117
}
121118

122119
return this;

src/utils/string/Format.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020
*/
2121
var Format = function (string, values)
2222
{
23-
string.replace(/%([0-9]+)/g, function (s, n)
23+
return string.replace(/%([0-9]+)/g, function (s, n)
2424
{
2525
return values[Number(n) - 1];
2626
});
27-
28-
return string;
2927
};
3028

3129
module.exports = Format;

0 commit comments

Comments
 (0)