mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-07 21:24:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change '_.extend' to 'Object.assign'

Browse source
This commit is contained in:
Ｈｏｎｇａｒｃ 2018-12-01 06:07:06 +07:00
parent 7ae05ce932
commit 052aa1e299
13 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/level/builder.js
View file

@ -360,7 +360,7 @@ var LevelBuilder = Level.extend({
},
getExportObj: function() {
var compiledLevel = _.extend(
var compiledLevel = Object.assign(
{},
this.level
);

4
src/js/level/index.js
View file

@ -70,7 +70,7 @@ var Level = Sandbox.extend({
// if there is a multiview in the beginning, open that
// and let it resolve our deferred
if (this.level.startDialog && !this.testOption('noIntroDialog')) {
new MultiView(_.extend(
new MultiView(Object.assign(
{},
intl.getStartDialog(this.level),
{ deferred: deferred }
@ -99,7 +99,7 @@ var Level = Sandbox.extend({
var dialog = $.extend({}, intl.getStartDialog(levelObj));
// grab the last slide only
dialog.childViews = dialog.childViews.slice(-1);
new MultiView(_.extend(
new MultiView(Object.assign(
dialog,
{ deferred: deferred }
));