diff --git a/deployit b/deployit index 28ba348..05ca219 100755 --- a/deployit +++ b/deployit @@ -3,7 +3,7 @@ command -v fleet fleet_installed=$? if [ ${fleet_installed} == 1 ]; then -npm install -g http://github.com/aikomastboom/fleet/archive/0.1.8.tar.gz +npm install -g http://github.com/aikomastboom/fleet/archive/0.1.9.tar.gz fi # deploy new commit diff --git a/helpers.js b/helpers.js index 67e25ea..a7c9bc8 100644 --- a/helpers.js +++ b/helpers.js @@ -29,7 +29,8 @@ function replace(text, marker, getReplacement, once) { }) }); when.all( - match_promises, + match_promises + ).then( function onSuccess(results) { deferred.resolve(results); }, @@ -45,7 +46,8 @@ function replace(text, marker, getReplacement, once) { function handTextManipulation(text, promises, handler, callback) { when.all( - promises, + promises + ).then( function onSuccess(all_results) { _.forEach(all_results, function loopResults(results) { _.forEach(results, function handleResult(result) { diff --git a/importer.js b/importer.js index 3030f28..21685b3 100644 --- a/importer.js +++ b/importer.js @@ -26,7 +26,8 @@ module.exports = function (config, mongoInstance) { }, // there can be only one import_leftovers true - ), + ) + ).then( function onSuccess(leftover) { handleImportMarkers(doc, options, function handleLeftover(err, remainder) { if (err) { diff --git a/package.json b/package.json index 0c7fa3e..f880c96 100644 --- a/package.json +++ b/package.json @@ -9,16 +9,16 @@ "private": "true", "dependencies": { "share": "~0.6.0", - "connect": "~2.7.6", - "express": "~3.2.0", + "connect": "~2.7.9", + "express": "~3.2.4", "bson": "~0.1.8", "mongodb": "~1.2.14", "handlebars": "~1.0.10", "underscore": "~1.4.4", "less": "~1.3.3", - "when": "~2.0.1", + "when": "~2.1.0", "markdown": "~0.4.0", - "async": "~0.2.7" + "async": "~0.2.8" }, "devDependencies": { "sockjs": "~0.3.5" diff --git a/preview.js b/preview.js index 506e23b..685247d 100644 --- a/preview.js +++ b/preview.js @@ -170,7 +170,8 @@ module.exports = function (config, mongoDataInstance) { }); }); return when.all( - promises, + promises + ).then( function onSuccess() { var rendered = null; try {