mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-03 11:14:27 +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

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

@ -372,7 +372,7 @@ var ConfirmCancelTerminal = Backbone.View.extend({
options = options || {};
this.deferred = options.deferred || Q.defer();
this.modalAlert = new ModalAlert(_.extend(
this.modalAlert = new ModalAlert(Object.assign(
{},
{ markdown: '#you sure?' },
options
@ -470,7 +470,7 @@ var NextLevelConfirm = ConfirmCancelTerminal.extend({
'</p>';
}
options = _.extend(
options = Object.assign(
{},
options,
{