Skip to content

Commit

Permalink
Merge pull request #32 from cardner/master
Browse files Browse the repository at this point in the history
fixed piping the json file, it was previously adding blank json files…
  • Loading branch information
cardner authored Sep 20, 2016
2 parents c53d5ce + 894d626 commit 78d5cc7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion assets/js/general.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ var dplSearch = new Bloodhound({
},
cache: false
},
limit: 20
limit: 60
});

// passing in `null` for the `options` arguments will result in the default options being used
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ gulp.task('fonts', () => (

gulp.task('json', () => (
gulp.src('assets/json/*.json')
.pipe(json('assets/json/'))
// .pipe(json('assets/json/'))
.pipe(gulp.dest('dist/json'))
))

Expand Down
4 changes: 2 additions & 2 deletions scripts/render_json.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ module.exports = base => stream((file, _, done) => {
let stdout = ''
let stderr = ''

const render = spawn(
'./scripts/render_json.py',
const render = spawn('python',
[
'./scripts/render_json.py',
'-i', file.path,
'-b', path.resolve(base),
]
Expand Down

0 comments on commit 78d5cc7

Please sign in to comment.