3 files changed, 12 insertions, 18 deletions
diff --git a/lib/handlebars.js b/lib/handlebars.js
index 7ca80a7..dede1b8 100644
--- a/lib/handlebars.js
+++ b/lib/handlebars.js
@@ -1,4 +1,4 @@
-import { HandlebarsEnvironment, createFrame } from "./handlebars/base";
+import { HandlebarsEnvironment, createFrame, logger, log } from "./handlebars/base";
 
 // Each of these augment the Handlebars object. No need to setup here.
 // (This is done to easily share code between commonjs and browse envs)
@@ -29,6 +29,9 @@ var create = function() {
   hb.template = template;
   hb.createFrame = createFrame;
 
+  hb.log = log;
+  hb.logger = logger;
+
   return hb;
 };
 
diff --git a/lib/handlebars/base.js b/lib/handlebars/base.js
index b375554..f4cb840 100644
--- a/lib/handlebars/base.js
+++ b/lib/handlebars/base.js
@@ -153,15 +153,15 @@ function registerDefaultHelpers(instance) {
 
 var levels = {
   DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3
-}
+};
 
 var methodMap = { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' };
 
 export var logger = {
   // can be overridden in the host environment
   log: function(level, obj) {
-    if (Handlebars.logger.level <= level) {
-      var method = Handlebars.logger.methodMap[level];
+    if (logger.level <= level) {
+      var method = logger.methodMap[level];
       if (typeof console !== 'undefined' && console[method]) {
         console[method].call(console, obj);
       }
@@ -169,7 +169,7 @@ export var logger = {
   }
 };
 
-export function log(level, obj) { logger.log(level, obj); };
+export function log(level, obj) { logger.log(level, obj); }
 
 export var createFrame = function(object) {
   var obj = {};
diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
index d3bd258..aecef85 100644
--- a/lib/handlebars/compiler/javascript-compiler.js
+++ b/lib/handlebars/compiler/javascript-compiler.js
@@ -1,8 +1,8 @@
-import { COMPILER_REVISION, REVISION_CHANGES } from "../base";
+import { COMPILER_REVISION, REVISION_CHANGES, log } from "../base";
 
 function Literal(value) {
   this.value = value;
-};
+}
 
 export function JavaScriptCompiler() {};
 
@@ -43,9 +43,7 @@ JavaScriptCompiler.prototype = {
     this.environment = environment;
     this.options = options || {};
 
-    // TODO: a module-compatible logger
-    // Handlebars.log(Handlebars.logger.DEBUG, this.environment.disassemble() + "\n\n");
-    log(this.environment.disassemble() + "\n\n");
+    log('debug', this.environment.disassemble() + "\n\n");
 
     this.name = this.environment.name;
     this.isChild = !!context;
@@ -167,11 +165,7 @@ JavaScriptCompiler.prototype = {
       return Function.apply(this, params);
     } else {
       var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
-
-      // TODO: a module-compatible logger
-      //Handlebars.log(Handlebars.logger.DEBUG, functionSource + "\n\n");
-      log(functionSource + "\n\n");
-
+      log('debug', functionSource + "\n\n");
       return functionSource;
     }
   },
@@ -847,6 +841,3 @@ JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
   return false;
 };
 
-function log(string) {
-  //console.log(string);
-}