Skip to content

Commit

Permalink
Merged branch master into master
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaslabbe committed Sep 23, 2016
2 parents 814462a + ccd2cdc commit 2085037
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "abe-cli",
"version": "2.3.16",
"version": "2.3.19",
"description": "Abe command line tool",
"main": "src/server/app.js",
"repository": {
Expand Down
8 changes: 7 additions & 1 deletion src/cli/handlebars/abe/compileAbe.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ export default function compileAbe(){
key = key[key.length - 1]
var hash = arguments[0].hash
hash.key = hash.key.replace(/\{\{@index\}\}/, '[{{@index}}]')
var value = ((content) ? content[hash['dictionnary']][arguments[0].data.index][key] : hash.key)
var value
try{
value = content ? content[hash['dictionnary']][arguments[0].data.index][key] : hash.key;
}
catch(e){
value = ''
}
if(typeof value === 'undefined' || typeof value === 'function' || value === null) {
value = ''
}
Expand Down

0 comments on commit 2085037

Please sign in to comment.