summaryrefslogtreecommitdiffstats
path: root/lib/handlebars/runtime.js
diff options
context:
space:
mode:
authorkpdecker <kpdecker@gmail.com>2013-05-31 13:12:06 -0400
committerkpdecker <kpdecker@gmail.com>2013-05-31 13:12:06 -0400
commit16fd601a5caab026f26fa8adb63e90e22d9f5d77 (patch)
treeda41e66239e486270dd1178e51611211f58dc4d0 /lib/handlebars/runtime.js
parentef062adcc24ea2c1c617cbe54de6d8982d739a40 (diff)
downloadhandlebars.js-16fd601a5caab026f26fa8adb63e90e22d9f5d77.zip
handlebars.js-16fd601a5caab026f26fa8adb63e90e22d9f5d77.tar.gz
handlebars.js-16fd601a5caab026f26fa8adb63e90e22d9f5d77.tar.bz2
Merge global and passed helpers and partials
Diffstat (limited to 'lib/handlebars/runtime.js')
-rw-r--r--lib/handlebars/runtime.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
index d99019d..2e845c4 100644
--- a/lib/handlebars/runtime.js
+++ b/lib/handlebars/runtime.js
@@ -18,6 +18,16 @@ Handlebars.VM = {
}
return programWrapper;
},
+ merge: function(param, common) {
+ var ret = param || common;
+
+ if (param && common) {
+ ret = {};
+ Handlebars.Utils.extend(ret, common);
+ Handlebars.Utils.extend(ret, param);
+ }
+ return ret;
+ },
programWithDepth: Handlebars.VM.programWithDepth,
noop: Handlebars.VM.noop,
compilerInfo: null