summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2014-03-17 19:41:47 +0000
committerMichael Williamson <mike@zwobble.org>2014-03-17 19:41:47 +0000
commitdca50ccd84f91a7db2a41a59e15b3ed95b2c3f46 (patch)
tree2b12394e159027cc8368f076f259f714e347445f
parent402125e641eec86ad771caa4b5ad9db657e5fcd9 (diff)
Remove dependency on xtend
-rw-r--r--lib/options-reader.js4
-rw-r--r--package.json3
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/options-reader.js b/lib/options-reader.js
index 687eb92..015e612 100644
--- a/lib/options-reader.js
+++ b/lib/options-reader.js
@@ -1,7 +1,6 @@
exports.readOptions = readOptions;
-var extend = require("xtend");
var _ = require("underscore");
var style = require("./style-reader").readStyle;
@@ -29,7 +28,8 @@ var standardOptions = exports._standardOptions = {
function readOptions(options) {
options = options || {};
- var fullOptions = extend(standardOptions, options);
+ var fullOptions = {}
+ _.extend(fullOptions, standardOptions, options);
fullOptions.styleMap = readStyleMap(options)
.concat(fullOptions.includeDefaultStyleMap ? standardOptions.styleMap : []);
diff --git a/package.json b/package.json
index 1a6576a..109c85f 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,7 @@
"dustjs-linkedin": "~1.2.1",
"async": "~0.2.6",
"buffers": "~0.1.1",
- "stream-buffers": "~0.2.4",
- "xtend": "~2.1.2"
+ "stream-buffers": "~0.2.4"
},
"devDependencies": {
"mocha": "~1.8",