Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Merge pull request #2210 from halfdan/use-lodash-extend

Browse source 
Remove unneeded extend implementation.
This commit is contained in:
Hannah Wolfe 2014-02-18 15:47:09 +00:00
commit 4349cb3018
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/server/require-tree.js
View file

@ -1,18 +1,9 @@
var when = require('when'), var _ = require('lodash'),
keys = require('when/keys'),
fs = require('fs'), fs = require('fs'),
keys = require('when/keys'),
path = require('path'), path = require('path'),
_ = require('lodash'), when = require('when'),
messages = {errors: [], warns: []}, messages = {errors: [], warns: []},
extend = function (obj, source) {
var key;
for (key in source) {
if (source.hasOwnProperty(key)) {
obj[key] = source[key];
}
}
return obj;
},
parsePackageJson = function (path) { parsePackageJson = function (path) {
var packageDeferred = when.defer(), var packageDeferred = when.defer(),
packagePromise = packageDeferred.promise, packagePromise = packageDeferred.promise,
@ -42,7 +33,7 @@ var when = require('when'),
readDir = function (dir, options, depth) { readDir = function (dir, options, depth) {
depth = depth || 0; depth = depth || 0;
options = extend({ options = _.extend({
index: true index: true
}, options); }, options);