Merging with latest master

2010-12-20 02:25:25 -05:00
parent 42414baa5c 8f502ffbe7
commit faea35f8fa
9 changed files with 734 additions and 88 deletions
@@ -54,10 +54,14 @@ module Handlebars
      context["exports"] = nil

      context["p"] = proc do |val|
-        p val
+        p val if ENV["DEBUG_JS"]
      end

      context["puts"] = proc do |val|
+        puts val if ENV["DEBUG_JS"]
+      end
+
+      context["puts_node"] = proc do |val|
        puts context["Handlebars"]["PrintVisitor"].new.accept(val)
        puts
      end
@@ -75,6 +79,7 @@ module Handlebars
      Handlebars::Spec.js_load('lib/handlebars/printer.js')
      Handlebars::Spec.js_load('lib/handlebars/runtime.js')
      Handlebars::Spec.js_load('lib/handlebars/utils.js')
+      Handlebars::Spec.js_load('lib/Handlebars/vm.js')
      Handlebars::Spec.js_load('lib/handlebars.js')
    end
  end