Skip to content
Permalink
Browse files

rm assignment

  • Loading branch information...
bevacqua committed Mar 3, 2016
1 parent b489ac9 commit e533bf94075bd5d8cf218b8f79b81a681cad6004
Showing with 4 additions and 5 deletions.
  1. +1 −1 CHANGELOG.md
  2. +2 −2 lib/rc.js
  3. +1 −2 lib/render.js
@@ -1,4 +1,4 @@
# v8.1.1 Once Upon a Time
# v8.1.2 Once Upon a Time

- Introduced `beforeRender` option to mangle a view model before Taunus renders a server-side view

@@ -1,8 +1,8 @@
'use strict';

var _ = require('lodash');
var fs = require('fs');
var path = require('path');
var assign = require('assignment');
var defaults = require('./.taunusrc.defaults.json');
var pkg = path.resolve('./package.json');
var rc = path.resolve('.taunusrc');
@@ -30,4 +30,4 @@ function dotfile () {
}
}

module.exports = assign({}, defaults, manifest());
module.exports = _.assign({}, defaults, manifest());
@@ -8,7 +8,6 @@ var hget = require('hget');
var crypto = require('crypto');
var contra = require('contra');
var safeson = require('safeson');
var assign = require('assignment');
var bro = require('./bro');
var accepts = require('./accepts');
var resolvers = require('./resolvers');
@@ -40,7 +39,7 @@ function cloneParams (params) {
}

function render (route, vm, req, res, next) {
var baked = assign({ model: {} }, state.defaults, vm, { version: state.version });
var baked = _.merge({ model: {} }, state.defaults, vm, { version: state.version });

if (!('redirect' in baked)) {
if (req.flash) {

0 comments on commit e533bf9

Please sign in to comment.
You can’t perform that action at this time.