From d87fd095c083033d2cce7467ec5900318f4d6f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EF=BC=A8=EF=BD=8F=EF=BD=8E=EF=BD=87=EF=BD=81=EF=BD=92?= =?UTF-8?q?=EF=BD=83?= Date: Sat, 1 Dec 2018 08:51:03 +0700 Subject: [PATCH] Use 'Object.values' and 'Object.keys' to get list 'keys' and 'values' --- src/js/git/index.js | 4 +--- src/js/models/commandModel.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/js/git/index.js b/src/js/git/index.js index 1b3299fc..d92567d7 100644 --- a/src/js/git/index.js +++ b/src/js/git/index.js @@ -2090,9 +2090,7 @@ GitEngine.prototype.hgRebase = function(destination, base) { }); }); - var branchList = _.map(branchMap, function(val, id) { - return id; - }); + var branchList = Object.keys(branchMap); chain = chain.then(function() { // now we just moved a bunch of commits, but we haven't updated the diff --git a/src/js/models/commandModel.js b/src/js/models/commandModel.js index f8932e10..07f02c87 100644 --- a/src/js/models/commandModel.js +++ b/src/js/models/commandModel.js @@ -83,7 +83,7 @@ var Command = Backbone.Model.extend({ }, this); var newMap = {}; _.each(options, function(args, key) { - newMap[key] = _.map(args, function(arg) { + newMap[key] = Object.values(args).map(function (arg) { return this.replaceDotWithHead(arg); }, this); }, this);