summaryrefslogtreecommitdiffstats
path: root/lib/handlebars/compiler/compiler.js
diff options
context:
space:
mode:
authorKevin Decker <kpdecker@gmail.com>2014-03-05 14:38:26 -0600
committerKevin Decker <kpdecker@gmail.com>2014-03-05 14:38:26 -0600
commit7dd64e5e92bb189052f5ecbd959e6a26cc294ed5 (patch)
tree9a3899c5e8a6218aeeb6dae62d800dde1d44988e /lib/handlebars/compiler/compiler.js
parent674d07fd033498057defeb14adeade8f9868d1f8 (diff)
parent8493822b621470a7423ec05d9f09e717725e3943 (diff)
downloadhandlebars.js-7dd64e5e92bb189052f5ecbd959e6a26cc294ed5.zip
handlebars.js-7dd64e5e92bb189052f5ecbd959e6a26cc294ed5.tar.gz
handlebars.js-7dd64e5e92bb189052f5ecbd959e6a26cc294ed5.tar.bz2
Merge pull request #749 from jenseng/option_subexpressions_fix
properly handle multiple subexpressions in the same hash, fixes #748
Diffstat (limited to 'lib/handlebars/compiler/compiler.js')
-rw-r--r--lib/handlebars/compiler/compiler.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/handlebars/compiler/compiler.js b/lib/handlebars/compiler/compiler.js
index 7acff1f..99d6f4f 100644
--- a/lib/handlebars/compiler/compiler.js
+++ b/lib/handlebars/compiler/compiler.js
@@ -188,15 +188,15 @@ Compiler.prototype = {
},
hash: function(hash) {
- var pairs = hash.pairs, pair;
+ var pairs = hash.pairs, i, l;
this.opcode('pushHash');
- for(var i=0, l=pairs.length; i<l; i++) {
- pair = pairs[i];
-
- this.pushParam(pair[1]);
- this.opcode('assignToHash', pair[0]);
+ for(i=0, l=pairs.length; i<l; i++) {
+ this.pushParam(pairs[i][1]);
+ }
+ while(i--) {
+ this.opcode('assignToHash', pairs[i][0]);
}
this.opcode('popHash');
},