summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpdecker <kpdecker@gmail.com>2015-11-19 22:58:26 -0600
committerkpdecker <kpdecker@gmail.com>2015-11-19 22:58:26 -0600
commit685cf92bcb67aba80665fc48bd6565a946ab32b7 (patch)
treebd75d024e8c5a9eb2f864ea0ef2842cbe806bbd0
parent7a6c22859279b42f5a12eef06cc99999e3152461 (diff)
downloadhandlebars.js-685cf92bcb67aba80665fc48bd6565a946ab32b7.zip
handlebars.js-685cf92bcb67aba80665fc48bd6565a946ab32b7.tar.gz
handlebars.js-685cf92bcb67aba80665fc48bd6565a946ab32b7.tar.bz2
Return current handlebars instance from noConflict
Fixes wycats/handlebars-site#131
-rw-r--r--lib/handlebars/no-conflict.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/handlebars/no-conflict.js b/lib/handlebars/no-conflict.js
index ad41e96..40a44d7 100644
--- a/lib/handlebars/no-conflict.js
+++ b/lib/handlebars/no-conflict.js
@@ -8,5 +8,6 @@ export default function(Handlebars) {
if (root.Handlebars === Handlebars) {
root.Handlebars = $Handlebars;
}
+ return Handlebars;
};
}