diff options
author | kpdecker <kpdecker@gmail.com> | 2014-12-27 13:30:20 -0600 |
---|---|---|
committer | kpdecker <kpdecker@gmail.com> | 2014-12-27 13:30:20 -0600 |
commit | ec798a7c4493cd0c4d78b42c78c667600fc1bed3 (patch) | |
tree | c2b504f11c32d900886418ceb8967642cc1207ca /lib/handlebars/compiler/javascript-compiler.js | |
parent | be0ba759250489858cb6844c5de47cfa003b87ba (diff) | |
parent | b764fb1ded3c2bb3c56796e6d7264981e63ba0d7 (diff) | |
download | handlebars.js-ec798a7c4493cd0c4d78b42c78c667600fc1bed3.zip handlebars.js-ec798a7c4493cd0c4d78b42c78c667600fc1bed3.tar.gz handlebars.js-ec798a7c4493cd0c4d78b42c78c667600fc1bed3.tar.bz2 |
Merge branch 'master' into visitor-update
Diffstat (limited to 'lib/handlebars/compiler/javascript-compiler.js')
-rw-r--r-- | lib/handlebars/compiler/javascript-compiler.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js index 9f40792..247f5e0 100644 --- a/lib/handlebars/compiler/javascript-compiler.js +++ b/lib/handlebars/compiler/javascript-compiler.js @@ -248,7 +248,7 @@ JavaScriptCompiler.prototype = { if (bufferStart) { bufferStart.prepend('return '); bufferEnd.add(';'); - } else { + } else if (!sourceSeen) { this.source.push('return "";'); } } else { @@ -263,7 +263,7 @@ JavaScriptCompiler.prototype = { } if (varDeclarations) { - this.source.prepend('var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n ')); + this.source.prepend('var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n')); } return this.source.merge(); |