From dca50ccd84f91a7db2a41a59e15b3ed95b2c3f46 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 17 Mar 2014 19:41:47 +0000 Subject: Remove dependency on xtend --- lib/options-reader.js | 4 ++-- package.json | 3 +-- 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", -- cgit v1.2.3