sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/{invoke_state_method.js → methods/invoke_state_method.js}

@@ -7,7 +7,7 @@ var TestState;
 var obj1, rootState1, stateA, stateB;
 var obj2, rootState2, stateC, stateD;
 
-module("SC.Statechart: invokeStateMethod Tests", {
+module("SC.Statechart: invokeStateMethod method Tests", {
   setup: function() {
     TestState = SC.State.extend({
       testInvokedCount: 0,

data/lib/frameworks/sproutcore/frameworks/statechart/tests/{event_handling/advanced → statechart}/respond_to_event.js

@@ -280,7 +280,7 @@ test("check states X, Y and Z", function() {
   ok(!statechart.respondsTo('eventC'), 'statechart should not respond to event eventC');
 });
 
-test("try to perform 'someFunction' on statechart -- current states A", function() {
+test("try to perform 'someFunction' on statechart -- current states A", function() {  
   ok(statechart.respondsTo('someFunction'), 'statechart should respond to someFunction');
   ok(!statechart.get('someFunctionInvoked'), 'someFunctionInvoked should be false');
   ok(statechart.tryToPerform('someFunction'), 'statechart should perform someFunction');

data/lib/frameworks/sproutcore/frameworks/statechart/tests/system/state_route_handler_context/methods/retry.js

@@ -0,0 +1,64 @@
+// ==========================================================================
+// SC.State Unit Test
+// ==========================================================================
+/*globals SC externalState1 externalState2 */
+
+var state, params, context;
+
+module("SC.StateRouteHandlerContext: retry Method Tests", {
+  
+  setup: function() { 
+  
+    params = { };
+    
+    state = SC.Object.create({
+
+      info: {},
+
+      handler: function(params) {
+        this.info.handler = {
+          params: params
+        };
+      }
+
+    });
+    
+    context = SC.StateRouteHandlerContext.create({
+      
+      state: state,
+      
+      params: params
+      
+    });
+    
+  },
+  
+  teardown: function() { 
+    params = state = context = null;
+  }
+
+});
+
+test("Invoke retry with context's handler property assigned a function value", function() {
+
+  context.set('handler', state.handler);
+  context.retry();
+  
+  var info = state.info;
+  
+  ok(info.handler, "state's handler method was invoked");
+  equals(info.handler.params, params, "state's handler was provided params");
+
+});
+
+test("Invoke retry with context's handler property assigned a string value", function() {
+
+  context.set('handler', 'handler');
+  context.retry();
+  
+  var info = state.info;
+  
+  ok(info.handler, "state's handler method was invoked");
+  equals(info.handler.params, params, "state's handler was provided params");
+
+});

data/lib/frameworks/sproutcore/frameworks/table/core.js

@@ -0,0 +1,2 @@
+/*@deprecated */
+SC.warn("SC.TableView is deprecated and will be removed in the next release.  There are several alternative table views available, please check sproutcore@googlegroups.com for suggestions.");

data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/controls/button.js

@@ -5,7 +5,6 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-sc_require('mixins/action_support');
 sc_require('views/template');
 
 /**

data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/ext/handlebars.js

@@ -1,3 +1,5 @@
+sc_require('handlebars');
+
 /**
   Prepares the Handlebars templating library for use inside SproutCore's view
   system.
@@ -33,28 +35,50 @@ SC.Handlebars.JavaScriptCompiler.prototype.compiler = SC.Handlebars.JavaScriptCo
 
 SC.Handlebars.JavaScriptCompiler.prototype.nameLookup = function(parent, name, type) {
   if (type === 'context') {
-    return "SC.get(" + parent + ", " + this.quotedString(name) + ");";
+    return "SC.get(" + parent + ", " + this.quotedString(name) + ")";
   } else {
     return Handlebars.JavaScriptCompiler.prototype.nameLookup.call(this, parent, name, type);
   }
 };
 
+/**
+  Rewrite simple mustaches from {{foo}} to {{bind "foo"}}. This means that all simple
+  mustaches in SproutCore's Handlebars will also set up an observer to keep the DOM
+  up to date when the underlying property changes.
+
+  @private
+*/
 SC.Handlebars.Compiler.prototype.mustache = function(mustache) {
   if (mustache.params.length || mustache.hash) {
     return Handlebars.Compiler.prototype.mustache.call(this, mustache);
   } else {
     var id = new Handlebars.AST.IdNode(['bind']);
+
+    // Update the mustache node to include a hash value indicating whether the original node
+    // was escaped. This will allow us to properly escape values when the underlying value
+    // changes and we need to re-render the value.
+    if(mustache.escaped) {
+      mustache.hash = mustache.hash || new Handlebars.AST.HashNode([]);
+      mustache.hash.pairs.push(["escaped", new Handlebars.AST.StringNode("true")]);
+    }
     mustache = new Handlebars.AST.MustacheNode([id].concat([mustache.id]), mustache.hash, !mustache.escaped);
     return Handlebars.Compiler.prototype.mustache.call(this, mustache);
   }
 };
 
+/**
+  The entry point for SproutCore Handlebars. This replaces the default Handlebars.compile and turns on
+  template-local data and String parameters.
+
+  @param {String} string The template to compile
+*/
 SC.Handlebars.compile = function(string) {
   var ast = Handlebars.parse(string);
-  var environment = new SC.Handlebars.Compiler().compile(ast, {data: true, stringParams: true});
-  var ret = new SC.Handlebars.JavaScriptCompiler().compile(environment, {data: true, stringParams: true});
-  ret.rawTemplate = string;
-  return ret;
+  var options = { data: true, stringParams: true };
+  var environment = new SC.Handlebars.Compiler().compile(ast, options);
+  var templateSpec = new SC.Handlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
+
+  return Handlebars.template(templateSpec);
 };
 
 /**

data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/ext/handlebars/bind.js

@@ -52,7 +52,8 @@ sc_require('ext/handlebars');
         inverseTemplate: inverse,
         property: property,
         previousContext: this,
-        tagName: (options.hash.tagName || "span")
+        tagName: (options.hash.tagName || "span"),
+        isEscaped: options.hash.escaped
       });
 
       var observer, invoker;
@@ -199,13 +200,13 @@ Handlebars.registerHelper('bindAttr', function(options) {
     // Do not add the attribute when the value is false
     if (value !== NO) {
       // Return the current value, in the form src="foo.jpg"
-      ret.push(attr+'="'+value+'"');
+      ret.push(attr + '="' + value + '"');
     }
   }, this);
 
   // Add the unique identifier
   ret.push('data-handlebars-id="'+dataId+'"');
-  return ret.join(' ');
+  return new Handlebars.SafeString(ret.join(' '));
 });
 
 /**

data/lib/frameworks/sproutcore/frameworks/{handlebars → template_view}/handlebars.js

@@ -1,91 +1,192 @@
-// lib/handlebars/parser.js
+// lib/handlebars/base.js
+var Handlebars = {};
+
+Handlebars.VERSION = "1.0.beta.2";
+
+Handlebars.helpers  = {};
+Handlebars.partials = {};
+
+Handlebars.registerHelper = function(name, fn, inverse) {
+  if(inverse) { fn.not = inverse; }
+  this.helpers[name] = fn;
+};
+
+Handlebars.registerPartial = function(name, str) {
+  this.partials[name] = str;
+};
+
+Handlebars.registerHelper('helperMissing', function(arg) {
+  if(arguments.length === 2) {
+    return undefined;
+  } else {
+    throw new Error("Could not find property '" + arg + "'");
+  }
+});
+
+Handlebars.registerHelper('blockHelperMissing', function(context, options) {
+  var inverse = options.inverse || function() {}, fn = options.fn;
+
+
+  var ret = "";
+  var type = Object.prototype.toString.call(context);
+
+  if(type === "[object Function]") {
+    context = context();
+  }
+
+  if(context === true) {
+    return fn(this);
+  } else if(context === false || context == null) {
+    return inverse(this);
+  } else if(type === "[object Array]") {
+    if(context.length > 0) {
+      for(var i=0, j=context.length; i<j; i++) {
+        ret = ret + fn(context[i]);
+      }
+    } else {
+      ret = inverse(this);
+    }
+    return ret;
+  } else {
+    return fn(context);
+  }
+});
+
+Handlebars.registerHelper('each', function(context, options) {
+  var fn = options.fn, inverse = options.inverse;
+  var ret = "";
+
+  if(context && context.length > 0) {
+    for(var i=0, j=context.length; i<j; i++) {
+      ret = ret + fn(context[i]);
+    }
+  } else {
+    ret = inverse(this);
+  }
+  return ret;
+});
+
+Handlebars.registerHelper('if', function(context, options) {
+  if(!context || Handlebars.Utils.isEmpty(context)) {
+    return options.inverse(this);
+  } else {
+    return options.fn(this);
+  }
+});
+
+Handlebars.registerHelper('unless', function(context, options) {
+  var fn = options.fn, inverse = options.inverse;
+  options.fn = inverse;
+  options.inverse = fn;
+
+  return Handlebars.helpers['if'].call(this, context, options);
+});
+
+Handlebars.registerHelper('with', function(context, options) {
+  return options.fn(context);
+});
+
+Handlebars.registerHelper('log', function(context) {
+  Handlebars.log(context);
+});
+;
+// lib/handlebars/compiler/parser.js
 /* Jison generated parser */
 var handlebars = (function(){
+
 var parser = {trace: function trace() { },
 yy: {},
-symbols_: {"error":2,"root":3,"program":4,"EOF":5,"statements":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"OPEN_PARTIAL":24,"params":25,"hash":26,"param":27,"STRING":28,"hashSegments":29,"hashSegment":30,"ID":31,"EQUALS":32,"pathSegments":33,"SEP":34,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"OPEN_PARTIAL",28:"STRING",31:"ID",32:"EQUALS",34:"SEP"},
-productions_: [0,[3,2],[4,3],[4,1],[4,0],[6,1],[6,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[7,2],[17,3],[17,2],[17,2],[17,1],[25,2],[25,1],[27,1],[27,1],[26,1],[29,2],[29,1],[30,3],[30,3],[21,1],[33,3],[33,1]],
+symbols_: {"error":2,"root":3,"program":4,"EOF":5,"statements":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"OPEN_PARTIAL":24,"params":25,"hash":26,"param":27,"STRING":28,"INTEGER":29,"BOOLEAN":30,"hashSegments":31,"hashSegment":32,"ID":33,"EQUALS":34,"pathSegments":35,"SEP":36,"$accept":0,"$end":1},
+terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"OPEN_PARTIAL",28:"STRING",29:"INTEGER",30:"BOOLEAN",33:"ID",34:"EQUALS",36:"SEP"},
+productions_: [0,[3,2],[4,3],[4,1],[4,0],[6,1],[6,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[7,2],[17,3],[17,2],[17,2],[17,1],[25,2],[25,1],[27,1],[27,1],[27,1],[27,1],[26,1],[31,2],[31,1],[32,3],[32,3],[32,3],[32,3],[21,1],[35,3],[35,1]],
 performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
 
 var $0 = $$.length - 1;
 switch (yystate) {
-case 1: return $$[$0-1] 
+case 1: return $$[$0-1]
+break;
+case 2: this.$ = new yy.ProgramNode($$[$0-2], $$[$0])
+break;
+case 3: this.$ = new yy.ProgramNode($$[$0])
+break;
+case 4: this.$ = new yy.ProgramNode([])
+break;
+case 5: this.$ = [$$[$0]]
 break;
-case 2: this.$ = new yy.ProgramNode($$[$0-2], $$[$0]) 
+case 6: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]
 break;
-case 3: this.$ = new yy.ProgramNode($$[$0]) 
+case 7: this.$ = new yy.InverseNode($$[$0-2], $$[$0-1], $$[$0])
 break;
-case 4: this.$ = new yy.ProgramNode([]) 
+case 8: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0])
 break;
-case 5: this.$ = [$$[$0]] 
+case 9: this.$ = $$[$0]
 break;
-case 6: $$[$0-1].push($$[$0]); this.$ = $$[$0-1] 
+case 10: this.$ = $$[$0]
 break;
-case 7: this.$ = new yy.InverseNode($$[$0-2], $$[$0-1], $$[$0]) 
+case 11: this.$ = new yy.ContentNode($$[$0])
 break;
-case 8: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0]) 
+case 12: this.$ = new yy.CommentNode($$[$0])
 break;
-case 9: this.$ = $$[$0] 
+case 13: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
 break;
-case 10: this.$ = $$[$0] 
+case 14: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
 break;
-case 11: this.$ = new yy.ContentNode($$[$0]) 
+case 15: this.$ = $$[$0-1]
 break;
-case 12: this.$ = new yy.CommentNode($$[$0]) 
+case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
 break;
-case 13: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]) 
+case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true)
 break;
-case 14: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]) 
+case 18: this.$ = new yy.PartialNode($$[$0-1])
 break;
-case 15: this.$ = $$[$0-1] 
+case 19: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1])
 break;
-case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]) 
+case 20:
 break;
-case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true) 
+case 21: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]]
 break;
-case 18: this.$ = new yy.PartialNode($$[$0-1]) 
+case 22: this.$ = [[$$[$0-1]].concat($$[$0]), null]
 break;
-case 19: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1]) 
+case 23: this.$ = [[$$[$0-1]], $$[$0]]
 break;
-case 20: 
+case 24: this.$ = [[$$[$0]], null]
 break;
-case 21: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]] 
+case 25: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
 break;
-case 22: this.$ = [[$$[$0-1]].concat($$[$0]), null] 
+case 26: this.$ = [$$[$0]]
 break;
-case 23: this.$ = [[$$[$0-1]], $$[$0]] 
+case 27: this.$ = $$[$0]
 break;
-case 24: this.$ = [[$$[$0]], null] 
+case 28: this.$ = new yy.StringNode($$[$0])
 break;
-case 25: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
+case 29: this.$ = new yy.IntegerNode($$[$0])
 break;
-case 26: this.$ = [$$[$0]] 
+case 30: this.$ = new yy.BooleanNode($$[$0])
 break;
-case 27: this.$ = $$[$0] 
+case 31: this.$ = new yy.HashNode($$[$0])
 break;
-case 28: this.$ = new yy.StringNode($$[$0]) 
+case 32: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]
 break;
-case 29: this.$ = new yy.HashNode($$[$0]) 
+case 33: this.$ = [$$[$0]]
 break;
-case 30: $$[$0-1].push($$[$0]); this.$ = $$[$0-1] 
+case 34: this.$ = [$$[$0-2], $$[$0]]
 break;
-case 31: this.$ = [$$[$0]] 
+case 35: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]
 break;
-case 32: this.$ = [$$[$0-2], $$[$0]] 
+case 36: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]
 break;
-case 33: this.$ = [$$[$0-2], new yy.StringNode($$[$0])] 
+case 37: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]
 break;
-case 34: this.$ = new yy.IdNode($$[$0]) 
+case 38: this.$ = new yy.IdNode($$[$0])
 break;
-case 35: $$[$0-2].push($$[$0]); this.$ = $$[$0-2]; 
+case 39: $$[$0-2].push($$[$0]); this.$ = $$[$0-2];
 break;
-case 36: this.$ = [$$[$0]] 
+case 40: this.$ = [$$[$0]]
 break;
 }
 },
-table: [{3:1,4:2,5:[2,4],6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{1:[3]},{5:[1,16]},{5:[2,3],7:17,8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,19],20:[2,3],22:[1,13],23:[1,14],24:[1,15]},{5:[2,5],14:[2,5],15:[2,5],16:[2,5],19:[2,5],20:[2,5],22:[2,5],23:[2,5],24:[2,5]},{4:20,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{4:21,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],24:[2,9]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],24:[2,10]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],24:[2,11]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],24:[2,12]},{17:22,21:23,31:[1,25],33:24},{17:26,21:23,31:[1,25],33:24},{17:27,21:23,31:[1,25],33:24},{17:28,21:23,31:[1,25],33:24},{21:29,31:[1,25],33:24},{1:[2,1]},{6:30,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{5:[2,6],14:[2,6],15:[2,6],16:[2,6],19:[2,6],20:[2,6],22:[2,6],23:[2,6],24:[2,6]},{17:22,18:[1,31],21:23,31:[1,25],33:24},{10:32,20:[1,33]},{10:34,20:[1,33]},{18:[1,35]},{18:[2,24],21:40,25:36,26:37,27:38,28:[1,41],29:39,30:42,31:[1,43],33:24},{18:[2,34],28:[2,34],31:[2,34],34:[1,44]},{18:[2,36],28:[2,36],31:[2,36],34:[2,36]},{18:[1,45]},{18:[1,46]},{18:[1,47]},{18:[1,48],21:49,31:[1,25],33:24},{5:[2,2],8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,2],22:[1,13],23:[1,14],24:[1,15]},{14:[2,20],15:[2,20],16:[2,20],19:[2,20],22:[2,20],23:[2,20],24:[2,20]},{5:[2,7],14:[2,7],15:[2,7],16:[2,7],19:[2,7],20:[2,7],22:[2,7],23:[2,7],24:[2,7]},{21:50,31:[1,25],33:24},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],24:[2,8]},{14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],24:[2,14]},{18:[2,22],21:40,26:51,27:52,28:[1,41],29:39,30:42,31:[1,43],33:24},{18:[2,23]},{18:[2,26],28:[2,26],31:[2,26]},{18:[2,29],30:53,31:[1,54]},{18:[2,27],28:[2,27],31:[2,27]},{18:[2,28],28:[2,28],31:[2,28]},{18:[2,31],31:[2,31]},{18:[2,36],28:[2,36],31:[2,36],32:[1,55],34:[2,36]},{31:[1,56]},{14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],24:[2,13]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],24:[2,16]},{5:[2,17],14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],24:[2,17]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],24:[2,18]},{18:[1,57]},{18:[1,58]},{18:[2,21]},{18:[2,25],28:[2,25],31:[2,25]},{18:[2,30],31:[2,30]},{32:[1,55]},{21:59,28:[1,60],31:[1,25],33:24},{18:[2,35],28:[2,35],31:[2,35],34:[2,35]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],24:[2,19]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],24:[2,15]},{18:[2,32],31:[2,32]},{18:[2,33],31:[2,33]}],
-defaultActions: {16:[2,1],37:[2,23],51:[2,21]},
+table: [{3:1,4:2,5:[2,4],6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{1:[3]},{5:[1,16]},{5:[2,3],7:17,8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,19],20:[2,3],22:[1,13],23:[1,14],24:[1,15]},{5:[2,5],14:[2,5],15:[2,5],16:[2,5],19:[2,5],20:[2,5],22:[2,5],23:[2,5],24:[2,5]},{4:20,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{4:21,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],24:[2,9]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],24:[2,10]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],24:[2,11]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],24:[2,12]},{17:22,21:23,33:[1,25],35:24},{17:26,21:23,33:[1,25],35:24},{17:27,21:23,33:[1,25],35:24},{17:28,21:23,33:[1,25],35:24},{21:29,33:[1,25],35:24},{1:[2,1]},{6:30,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{5:[2,6],14:[2,6],15:[2,6],16:[2,6],19:[2,6],20:[2,6],22:[2,6],23:[2,6],24:[2,6]},{17:22,18:[1,31],21:23,33:[1,25],35:24},{10:32,20:[1,33]},{10:34,20:[1,33]},{18:[1,35]},{18:[2,24],21:40,25:36,26:37,27:38,28:[1,41],29:[1,42],30:[1,43],31:39,32:44,33:[1,45],35:24},{18:[2,38],28:[2,38],29:[2,38],30:[2,38],33:[2,38],36:[1,46]},{18:[2,40],28:[2,40],29:[2,40],30:[2,40],33:[2,40],36:[2,40]},{18:[1,47]},{18:[1,48]},{18:[1,49]},{18:[1,50],21:51,33:[1,25],35:24},{5:[2,2],8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,2],22:[1,13],23:[1,14],24:[1,15]},{14:[2,20],15:[2,20],16:[2,20],19:[2,20],22:[2,20],23:[2,20],24:[2,20]},{5:[2,7],14:[2,7],15:[2,7],16:[2,7],19:[2,7],20:[2,7],22:[2,7],23:[2,7],24:[2,7]},{21:52,33:[1,25],35:24},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],24:[2,8]},{14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],24:[2,14]},{18:[2,22],21:40,26:53,27:54,28:[1,41],29:[1,42],30:[1,43],31:39,32:44,33:[1,45],35:24},{18:[2,23]},{18:[2,26],28:[2,26],29:[2,26],30:[2,26],33:[2,26]},{18:[2,31],32:55,33:[1,56]},{18:[2,27],28:[2,27],29:[2,27],30:[2,27],33:[2,27]},{18:[2,28],28:[2,28],29:[2,28],30:[2,28],33:[2,28]},{18:[2,29],28:[2,29],29:[2,29],30:[2,29],33:[2,29]},{18:[2,30],28:[2,30],29:[2,30],30:[2,30],33:[2,30]},{18:[2,33],33:[2,33]},{18:[2,40],28:[2,40],29:[2,40],30:[2,40],33:[2,40],34:[1,57],36:[2,40]},{33:[1,58]},{14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],24:[2,13]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],24:[2,16]},{5:[2,17],14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],24:[2,17]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],24:[2,18]},{18:[1,59]},{18:[1,60]},{18:[2,21]},{18:[2,25],28:[2,25],29:[2,25],30:[2,25],33:[2,25]},{18:[2,32],33:[2,32]},{34:[1,57]},{21:61,28:[1,62],29:[1,63],30:[1,64],33:[1,25],35:24},{18:[2,39],28:[2,39],29:[2,39],30:[2,39],33:[2,39],36:[2,39]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],24:[2,19]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],24:[2,15]},{18:[2,34],33:[2,34]},{18:[2,35],33:[2,35]},{18:[2,36],33:[2,36]},{18:[2,37],33:[2,37]}],
+defaultActions: {16:[2,1],37:[2,23],53:[2,21]},
 parseError: function parseError(str, hash) {
     throw new Error(str);
 },
@@ -107,6 +208,8 @@ parse: function parse(input) {
     this.lexer.setInput(input);
     this.lexer.yy = this.yy;
     this.yy.lexer = this.lexer;
+    if (typeof this.lexer.yylloc == 'undefined')
+        this.lexer.yylloc = {};
     var yyloc = this.lexer.yylloc;
     lstack.push(yyloc);
 
@@ -191,7 +294,7 @@ parse: function parse(input) {
                 popStack(1);
                 state = stack[stack.length-1];
             }
-            
+
             preErrorSymbol = symbol; // save the lookahead token
             symbol = TERROR;         // insert generic error symbol as new lookahead
             state = stack[stack.length-1];
@@ -270,7 +373,9 @@ parse: function parse(input) {
 
     return true;
 }};/* Jison generated lexer */
-var lexer = (function(){var lexer = ({EOF:1,
+var lexer = (function(){
+
+var lexer = ({EOF:1,
 parseError:function parseError(str, hash) {
         if (this.yy.parseError) {
             this.yy.parseError(str, hash);
@@ -345,7 +450,7 @@ next:function () {
                 this.yylloc = {first_line: this.yylloc.last_line,
                                last_line: this.yylineno+1,
                                first_column: this.yylloc.last_column,
-                               last_column: lines ? lines[lines.length-1].length-1 : this.yylloc.last_column + match.length}
+                               last_column: lines ? lines[lines.length-1].length-1 : this.yylloc.last_column + match[0].length}
                 this.yytext += match[0];
                 this.match += match[0];
                 this.matches = match;
@@ -361,7 +466,7 @@ next:function () {
         if (this._input === "") {
             return this.EOF;
         } else {
-            this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(), 
+            this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
                     {text: "", token: null, line: this.yylineno});
         }
     },
@@ -386,60 +491,66 @@ lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_STA
 
 var YYSTATE=YY_START
 switch($avoiding_name_collisions) {
-case 0: this.begin("mu"); if (yy_.yytext) return 14; 
+case 0: this.begin("mu"); if (yy_.yytext) return 14;
+break;
+case 1: return 14;
+break;
+case 2: return 24;
+break;
+case 3: return 16;
 break;
-case 1: return 14; 
+case 4: return 20;
 break;
-case 2: return 24; 
+case 5: return 19;
 break;
-case 3: return 16; 
+case 6: return 19;
 break;
-case 4: return 20; 
+case 7: return 23;
 break;
-case 5: return 19; 
+case 8: return 23;
 break;
-case 6: return 19; 
+case 9: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.begin("INITIAL"); return 15;
 break;
-case 7: return 23; 
+case 10: return 22;
 break;
-case 8: return 23; 
+case 11: return 34;
 break;
-case 9: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.begin("INITIAL"); return 15; 
+case 12: return 33;
 break;
-case 10: return 22; 
+case 13: return 33;
 break;
-case 11: return 32; 
+case 14: return 36;
 break;
-case 12: return 31; 
+case 15: /*ignore whitespace*/
 break;
-case 13: return 31; 
+case 16: this.begin("INITIAL"); return 18;
 break;
-case 14: return 34; 
+case 17: this.begin("INITIAL"); return 18;
 break;
-case 15: /*ignore whitespace*/ 
+case 18: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28;
 break;
-case 16: this.begin("INITIAL"); return 18; 
+case 19: return 30;
 break;
-case 17: this.begin("INITIAL"); return 18; 
+case 20: return 30;
 break;
-case 18: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28; 
+case 21: return 29;
 break;
-case 19: return 31; 
+case 22: return 33;
 break;
-case 20: return 'INVALID'; 
+case 23: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 33;
 break;
-case 21: return 5; 
+case 24: return 'INVALID';
+break;
+case 25: return 5;
 break;
 }
 };
-lexer.rules = [/^[^\x00]*?(?=(\{\{))/,/^[^\x00]+/,/^\{\{>/,/^\{\{#/,/^\{\{\//,/^\{\{\^/,/^\{\{\s*else\b/,/^\{\{\{/,/^\{\{&/,/^\{\{!.*?\}\}/,/^\{\{/,/^=/,/^\.(?=[} ])/,/^\.\./,/^[/.]/,/^\s+/,/^\}\}\}/,/^\}\}/,/^"(\\["]|[^"])*"/,/^[a-zA-Z0-9_]+(?=[=} /.])/,/^./,/^$/];
-lexer.conditions = {"mu":{"rules":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21],"inclusive":false},"INITIAL":{"rules":[0,1,21],"inclusive":true}};return lexer;})()
+lexer.rules = [/^[^\x00]*?(?=(\{\{))/,/^[^\x00]+/,/^\{\{>/,/^\{\{#/,/^\{\{\//,/^\{\{\^/,/^\{\{\s*else\b/,/^\{\{\{/,/^\{\{&/,/^\{\{![\s\S]*?\}\}/,/^\{\{/,/^=/,/^\.(?=[} ])/,/^\.\./,/^[/.]/,/^\s+/,/^\}\}\}/,/^\}\}/,/^"(\\["]|[^"])*"/,/^true(?=[}\s])/,/^false(?=[}\s])/,/^[0-9]+(?=[}\s])/,/^[a-zA-Z0-9_$-]+(?=[=}\s/.])/,/^\[.*\]/,/^./,/^$/];
+lexer.conditions = {"mu":{"rules":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25],"inclusive":false},"INITIAL":{"rules":[0,1,25],"inclusive":true}};return lexer;})()
 parser.lexer = lexer;
 return parser;
-})();
-// lib/handlebars/base.js
-var Handlebars = {};
-
+})();;
+// lib/handlebars/compiler/base.js
 Handlebars.Parser = handlebars;
 
 Handlebars.parse = function(string) {
@@ -451,101 +562,6 @@ Handlebars.print = function(ast) {
   return new Handlebars.PrintVisitor().accept(ast);
 };
 
-Handlebars.Runtime = {};
-
-Handlebars.Runtime.compile = function(string) {
-  var ast = Handlebars.parse(string);
-
-  return function(context, helpers, partials) {
-    helpers  = helpers || Handlebars.helpers;
-    partials = partials || Handlebars.partials;
-
-    var internalContext = new Handlebars.Context(context, helpers, partials);
-    var runtime = new Handlebars.Runtime(internalContext);
-    runtime.accept(ast);
-    return runtime.buffer;
-  };
-};
-
-Handlebars.helpers  = {};
-Handlebars.partials = {};
-
-Handlebars.registerHelper = function(name, fn, inverse) {
-  if(inverse) { fn.not = inverse; }
-  this.helpers[name] = fn;
-};
-
-Handlebars.registerPartial = function(name, str) {
-  this.partials[name] = str;
-};
-
-Handlebars.registerHelper('helperMissing', function(arg) {
-  if(arguments.length === 2) {
-    return undefined;
-  } else {
-    throw new Error("Could not find property '" + arg + "'");
-  }
-});
-
-Handlebars.registerHelper('blockHelperMissing', function(context, fn, inverse) {
-  inverse = inverse || function() {};
-
-  var ret = "";
-  var type = Object.prototype.toString.call(context);
-
-  if(type === "[object Function]") {
-    context = context();
-  }
-
-  if(context === true) {
-    return fn(this);
-  } else if(context === false || context == null) {
-    return inverse(this);
-  } else if(type === "[object Array]") {
-    if(context.length > 0) {
-      for(var i=0, j=context.length; i<j; i++) {
-        ret = ret + fn(context[i]);
-      }
-    } else {
-      ret = inverse(this);
-    }
-    return ret;
-  } else {
-    return fn(context);
-  }
-}, function(context, fn) {
-  return fn(context);
-});
-
-Handlebars.registerHelper('each', function(context, fn, inverse) {
-  var ret = "";
-
-  if(context && context.length > 0) {
-    for(var i=0, j=context.length; i<j; i++) {
-      ret = ret + fn(context[i]);
-    }
-  } else {
-    ret = inverse(this);
-  }
-  return ret;
-});
-
-Handlebars.registerHelper('if', function(context, fn, inverse) {
-  if(!context || context == []) {
-    return inverse(this);
-  } else {
-    return fn(this);
-  }
-});
-
-Handlebars.registerHelper('unless', function(context, fn, inverse) {
-  return Handlebars.helpers['if'].call(this, context, inverse, fn);
-});
-
-Handlebars.registerHelper('with', function(context, fn) {
-  return fn(context);
-});
-
 Handlebars.logger = {
   DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
 
@@ -555,7 +571,7 @@ Handlebars.logger = {
 
 Handlebars.log = function(level, str) { Handlebars.logger.log(level, str); };
 ;
-// lib/handlebars/ast.js
+// lib/handlebars/compiler/ast.js
 (function() {
 
   Handlebars.AST = {};
@@ -623,7 +639,7 @@ Handlebars.log = function(level, str) { Handlebars.logger.log(level, str); };
       var part = parts[i];
 
       if(part === "..") { depth++; }
-      else if(part === "." || part === "this") { continue; }
+      else if(part === "." || part === "this") { this.isScoped = true; }
       else { dig.push(part); }
     }
 
@@ -638,25 +654,31 @@ Handlebars.log = function(level, str) { Handlebars.logger.log(level, str); };
     this.string = string;
   };
 
+  Handlebars.AST.IntegerNode = function(integer) {
+    this.type = "INTEGER";
+    this.integer = integer;
+  };
+
+  Handlebars.AST.BooleanNode = function(bool) {
+    this.type = "BOOLEAN";
+    this.bool = bool;
+  };
+
   Handlebars.AST.CommentNode = function(comment) {
     this.type = "comment";
     this.comment = comment;
   };
 
 })();;
-// lib/handlebars/visitor.js
-
-Handlebars.Visitor = function() {};
-
-Handlebars.Visitor.prototype = {
-  accept: function(object) {
-    return this[object.type](object);
-  }
-};;
 // lib/handlebars/utils.js
 Handlebars.Exception = function(message) {
-  this.message = message;
+  var tmp = Error.prototype.constructor.apply(this, arguments);
+
+  for (var p in tmp) {
+    if (tmp.hasOwnProperty(p)) { this[p] = tmp[p]; }
+  }
 };
+Handlebars.Exception.prototype = new Error;
 
 // Build out our basic SafeString type
 Handlebars.SafeString = function(string) {
@@ -669,14 +691,17 @@ Handlebars.SafeString.prototype.toString = function() {
 (function() {
   var escape = {
     "<": "&lt;",
-    ">": "&gt;"
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&#x27;",
+    "`": "&#x60;"
   };
 
-  var badChars = /&(?!\w+;)|[<>]/g;
-  var possible = /[&<>]/
+  var badChars = /&(?!\w+;)|[<>"'`]/g;
+  var possible = /[&<>"'`]/;
 
   var escapeChar = function(chr) {
-    return escape[chr] || "&amp;"
+    return escape[chr] || "&amp;";
   };
 
   Handlebars.Utils = {
@@ -707,7 +732,7 @@ Handlebars.SafeString.prototype.toString = function() {
     }
   };
 })();;
-// lib/handlebars/vm.js
+// lib/handlebars/compiler/compiler.js
 Handlebars.Compiler = function() {};
 Handlebars.JavaScriptCompiler = function() {};
 
@@ -726,7 +751,6 @@ Handlebars.JavaScriptCompiler = function() {};
     invokeProgram: 11,
     invokePartial: 12,
     push: 13,
-    invokeInverse: 14,
     assignToHash: 15,
     pushStringParam: 16
   };
@@ -734,16 +758,15 @@ Handlebars.JavaScriptCompiler = function() {};
   Compiler.MULTI_PARAM_OPCODES = {
     appendContent: 1,
     getContext: 1,
-    lookupWithHelpers: 1,
+    lookupWithHelpers: 2,
     lookup: 1,
-    invokeMustache: 2,
+    invokeMustache: 3,
     pushString: 1,
     truthyOrFallback: 1,
     functionOrFallback: 1,
-    invokeProgram: 2,
+    invokeProgram: 3,
     invokePartial: 1,
     push: 1,
-    invokeInverse: 1,
     assignToHash: 1,
     pushStringParam: 1
   };
@@ -803,7 +826,25 @@ Handlebars.JavaScriptCompiler = function() {};
     compile: function(program, options) {
       this.children = [];
       this.depths = {list: []};
-      this.options = options || {};
+      this.options = options;
+
+      // These changes will propagate to the other compiler components
+      var knownHelpers = this.options.knownHelpers;
+      this.options.knownHelpers = {
+        'helperMissing': true,
+        'blockHelperMissing': true,
+        'each': true,
+        'if': true,
+        'unless': true,
+        'with': true,
+        'log': true
+      };
+      if (knownHelpers) {
+        for (var name in knownHelpers) {
+          this.options.knownHelpers[name] = knownHelpers[name];
+        }
+      }
+
       return this.program(program);
     },
 
@@ -819,6 +860,7 @@ Handlebars.JavaScriptCompiler = function() {};
         statement = statements[i];
         this[statement.type](statement);
       }
+      this.isSimple = l === 1;
 
       this.depths.list = this.depths.list.sort(function(a, b) {
         return a - b;
@@ -858,16 +900,19 @@ Handlebars.JavaScriptCompiler = function() {};
         this.declare('inverse', inverseGuid);
       }
 
-      this.opcode('invokeProgram', programGuid, params.length);
+      this.opcode('invokeProgram', programGuid, params.length, !!mustache.hash);
       this.declare('inverse', null);
       this.opcode('append');
     },
 
     inverse: function(block) {
-      this.ID(block.mustache.id);
+      var params = this.setupStackForMustache(block.mustache);
+
       var programGuid = this.compileProgram(block.program);
 
-      this.opcode('invokeInverse', programGuid);
+      this.declare('inverse', programGuid);
+
+      this.opcode('invokeProgram', null, params.length, !!block.mustache.hash);
       this.opcode('append');
     },
 
@@ -892,7 +937,7 @@ Handlebars.JavaScriptCompiler = function() {};
       if(partial.context) {
         this.ID(partial.context);
       } else {
-        this.opcode('push', 'context');
+        this.opcode('push', 'depth0');
       }
 
       this.opcode('invokePartial', id.original);
@@ -906,7 +951,7 @@ Handlebars.JavaScriptCompiler = function() {};
     mustache: function(mustache) {
       var params = this.setupStackForMustache(mustache);
 
-      this.opcode('invokeMustache', params.length, mustache.id.original);
+      this.opcode('invokeMustache', params.length, mustache.id.original, !!mustache.hash);
 
       if(mustache.escaped) {
         this.opcode('appendEscaped');
@@ -920,7 +965,7 @@ Handlebars.JavaScriptCompiler = function() {};
 
       this.opcode('getContext', id.depth);
 
-      this.opcode('lookupWithHelpers', id.parts[0] || null);
+      this.opcode('lookupWithHelpers', id.parts[0] || null, id.isScoped || false);
 
       for(var i=1, l=id.parts.length; i<l; i++) {
         this.opcode('lookup', id.parts[i]);
@@ -931,6 +976,14 @@ Handlebars.JavaScriptCompiler = function() {};
       this.opcode('pushString', string.string);
     },
 
+    INTEGER: function(integer) {
+      this.opcode('push', integer.integer);
+    },
+
+    BOOLEAN: function(bool) {
+      this.opcode('push', bool.bool);
+    },
+
     comment: function() {},
 
     // HELPERS
@@ -953,10 +1006,11 @@ Handlebars.JavaScriptCompiler = function() {};
       }
     },
 
-    opcode: function(name, val1, val2) {
+    opcode: function(name, val1, val2, val3) {
       this.opcodes.push(Compiler.OPCODE_MAP[name]);
       if(val1 !== undefined) { this.opcodes.push(val1); }
       if(val2 !== undefined) { this.opcodes.push(val2); }
+      if(val3 !== undefined) { this.opcodes.push(val3); }
     },
 
     declare: function(name, value) {
@@ -981,8 +1035,6 @@ Handlebars.JavaScriptCompiler = function() {};
 
       if(mustache.hash) {
         this.hash(mustache.hash);
-      } else {
-        this.opcode('push', '{}');
       }
 
       this.ID(mustache.id);
@@ -995,37 +1047,51 @@ Handlebars.JavaScriptCompiler = function() {};
     // PUBLIC API: You can override these methods in a subclass to provide
     // alternative compiled forms for name lookup and buffering semantics
     nameLookup: function(parent, name, type) {
-      if(JavaScriptCompiler.RESERVED_WORDS[name]) {
-        return parent + "['" + name + "']";
-      } else {
-        return parent + "." + name;
+            if (/^[0-9]+$/.test(name)) {
+        return parent + "[" + name + "]";
+      } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
+            return parent + "." + name;
+            }
+            else {
+                return parent + "['" + name + "']";
       }
     },
 
     appendToBuffer: function(string) {
-      return "buffer = buffer + " + string + ";";
+      if (this.environment.isSimple) {
+        return "return " + string + ";";
+      } else {
+        return "buffer += " + string + ";";
+      }
     },
 
     initializeBuffer: function() {
       return this.quotedString("");
     },
+
+    namespace: "Handlebars",
     // END PUBLIC API
 
-    compile: function(environment, options) {
+    compile: function(environment, options, context, asObject) {
       this.environment = environment;
       this.options = options || {};
 
+      this.name = this.environment.name;
+      this.isChild = !!context;
+      this.context = context || {
+        programs: [],
+        aliases: { self: 'this' },
+        registers: {list: []}
+      };
+
       this.preamble();
 
       this.stackSlot = 0;
       this.stackVars = [];
-      this.registers = {list: []};
 
       this.compileChildren(environment, options);
 
-      Handlebars.log(Handlebars.logger.DEBUG, environment.disassemble() + "\n\n");
-
-      var opcodes = environment.opcodes, opcode, name, declareName, declareVal;
+      var opcodes = environment.opcodes, opcode;
 
       this.i = 0;
 
@@ -1041,7 +1107,7 @@ Handlebars.JavaScriptCompiler = function() {};
         }
       }
 
-      return this.createFunction();
+      return this.createFunctionContext(asObject);
     },
 
     nextOpcode: function(n) {
@@ -1072,11 +1138,21 @@ Handlebars.JavaScriptCompiler = function() {};
 
     preamble: function() {
       var out = [];
-      out.push("var buffer = " + this.initializeBuffer() + ", currentContext = context");
 
-      var copies = "helpers = helpers || Handlebars.helpers;";
-      if(this.environment.usePartial) { copies = copies + " partials = partials || Handlebars.partials;"; }
-      out.push(copies);
+      if (!this.isChild) {
+        var namespace = this.namespace;
+        var copies = "helpers = helpers || " + namespace + ".helpers;";
+        if(this.environment.usePartial) { copies = copies + " partials = partials || " + namespace + ".partials;"; }
+        out.push(copies);
+      } else {
+        out.push('');
+      }
+
+      if (!this.environment.isSimple) {
+        out.push(", buffer = " + this.initializeBuffer());
+      } else {
+        out.push("");
+      }
 
       // track the last context pushed into place to allow skipping the
       // getContext opcode when it would be a noop
@@ -1084,65 +1160,52 @@ Handlebars.JavaScriptCompiler = function() {};
       this.source = out;
     },
 
-    createFunction: function() {
-      var container = {
-        escapeExpression: Handlebars.Utils.escapeExpression,
-        invokePartial: Handlebars.VM.invokePartial,
-        programs: [],
-        program: function(i, helpers, partials, data) {
-          var programWrapper = this.programs[i];
-          if(data) {
-            return Handlebars.VM.program(this.children[i], helpers, partials, data);
-          } else if(programWrapper) {
-            return programWrapper;
-          } else {
-            programWrapper = this.programs[i] = Handlebars.VM.program(this.children[i], helpers, partials);
-            return programWrapper;
-          }
-        },
-        programWithDepth: Handlebars.VM.programWithDepth,
-        noop: Handlebars.VM.noop
-      };
-      var locals = this.stackVars.concat(this.registers.list);
+    createFunctionContext: function(asObject) {
+      var locals = this.stackVars;
+      if (!this.isChild) {
+        locals = locals.concat(this.context.registers.list);
+      }
 
       if(locals.length > 0) {
-        this.source[0] = this.source[0] + ", " + locals.join(", ");
+        this.source[1] = this.source[1] + ", " + locals.join(", ");
+      }
+
+      // Generate minimizer alias mappings
+      if (!this.isChild) {
+        var aliases = []
+        for (var alias in this.context.aliases) {
+          this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
+        }
       }
 
-      this.source[0] = this.source[0] + ";";
+      if (this.source[1]) {
+        this.source[1] = "var " + this.source[1].substring(2) + ";";
+      }
 
-      this.source.push("return buffer;");
+      // Merge children
+      if (!this.isChild) {
+        this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
+      }
 
-      var params = ["Handlebars", "context", "helpers", "partials"];
+      if (!this.environment.isSimple) {
+        this.source.push("return buffer;");
+      }
 
-      if(this.options.data) { params.push("data"); }
+      var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
 
       for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
         params.push("depth" + this.environment.depths.list[i]);
       }
 
-      if(params.length === 4 && !this.environment.usePartial) { params.pop(); }
+      if (asObject) {
+        params.push(this.source.join("\n  "));
 
-      params.push(this.source.join("\n"));
-
-      var fn = Function.apply(this, params);
-      fn.displayName = "Handlebars.js";
-
-      Handlebars.log(Handlebars.logger.DEBUG, fn.toString() + "\n\n");
-
-      container.render = fn;
-
-      container.children = this.environment.children;
-
-      return function(context, helpers, partials, data, $depth) {
-        try {
-          var args = Array.prototype.slice.call(arguments);
-          args.unshift(Handlebars);
-          return container.render.apply(container, args);
-        } catch(e) {
-          throw e;
-        }
-      };
+        return Function.apply(this, params);
+      } else {
+        var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + this.source.join("\n  ") + '}';
+        Handlebars.log(Handlebars.logger.DEBUG, functionSource + "\n\n");
+        return functionSource;
+      }
     },
 
     appendContent: function(content) {
@@ -1152,54 +1215,63 @@ Handlebars.JavaScriptCompiler = function() {};
     append: function() {
       var local = this.popStack();
       this.source.push("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
+      if (this.environment.isSimple) {
+        this.source.push("else { " + this.appendToBuffer("''") + " }");
+      }
     },
 
     appendEscaped: function() {
       var opcode = this.nextOpcode(1), extra = "";
+      this.context.aliases.escapeExpression = 'this.escapeExpression';
 
       if(opcode[0] === 'appendContent') {
         extra = " + " + this.quotedString(opcode[1][0]);
         this.eat(opcode);
       }
 
-      this.source.push(this.appendToBuffer("this.escapeExpression(" + this.popStack() + ")" + extra));
+      this.source.push(this.appendToBuffer("escapeExpression(" + this.popStack() + ")" + extra));
     },
 
     getContext: function(depth) {
       if(this.lastContext !== depth) {
         this.lastContext = depth;
-
-        if(depth === 0) {
-          this.source.push("currentContext = context;");
-        } else {
-          this.source.push("currentContext = depth" + depth + ";");
-        }
       }
     },
 
-    lookupWithHelpers: function(name) {
+    lookupWithHelpers: function(name, isScoped) {
       if(name) {
         var topStack = this.nextStack();
 
-        var toPush =  "if('" + name + "' in helpers) { " + topStack +
-                      " = " + this.nameLookup('helpers', name, 'helper') +
-                      "; } else { " + topStack + " = " +
-                      this.nameLookup('currentContext', name, 'context') +
-                      "; }";
+        this.usingKnownHelper = false;
 
+        var toPush;
+        if (!isScoped && this.options.knownHelpers[name]) {
+          toPush = topStack + " = " + this.nameLookup('helpers', name, 'helper');
+          this.usingKnownHelper = true;
+        } else if (isScoped || this.options.knownHelpersOnly) {
+          toPush = topStack + " = " + this.nameLookup('depth' + this.lastContext, name, 'context');
+        } else {
+          toPush =  topStack + " = "
+              + this.nameLookup('helpers', name, 'helper')
+              + " || "
+              + this.nameLookup('depth' + this.lastContext, name, 'context');
+        }
+
+        toPush += ';';
         this.source.push(toPush);
       } else {
-        this.pushStack("currentContext");
+        this.pushStack('depth' + this.lastContext);
       }
     },
 
     lookup: function(name) {
       var topStack = this.topStack();
-      this.source.push(topStack + " = " + this.nameLookup(topStack, name, 'context') + ";");
+      this.source.push(topStack + " = (" + topStack + " === null || " + topStack + " === undefined || " + topStack + " === false ? " +
+                topStack + " : " + this.nameLookup(topStack, name, 'context') + ");");
     },
 
     pushStringParam: function(string) {
-      this.pushStack("currentContext");
+      this.pushStack('depth' + this.lastContext);
       this.pushString(string);
     },
 
@@ -1211,30 +1283,47 @@ Handlebars.JavaScriptCompiler = function() {};
       this.pushStack(name);
     },
 
-    invokeMustache: function(paramSize, original) {
-      this.populateParams(paramSize, this.quotedString(original), "{}", null, function(nextStack, helperMissingString, id) {
-        this.source.push("else if(" + id + "=== undefined) { " + nextStack + " = helpers.helperMissing.call(" + helperMissingString + "); }");
-        this.source.push("else { " + nextStack + " = " + id + "; }");
+    invokeMustache: function(paramSize, original, hasHash) {
+      this.populateParams(paramSize, this.quotedString(original), "{}", null, hasHash, function(nextStack, helperMissingString, id) {
+        if (!this.usingKnownHelper) {
+          this.context.aliases.helperMissing = 'helpers.helperMissing';
+          this.context.aliases.undef = 'void 0';
+          this.source.push("else if(" + id + "=== undef) { " + nextStack + " = helperMissing.call(" + helperMissingString + "); }");
+          if (nextStack !== id) {
+            this.source.push("else { " + nextStack + " = " + id + "; }");
+          }
+        }
       });
     },
 
-    invokeProgram: function(guid, paramSize) {
+    invokeProgram: function(guid, paramSize, hasHash) {
       var inverse = this.programExpression(this.inverse);
       var mainProgram = this.programExpression(guid);
 
-      this.populateParams(paramSize, null, mainProgram, inverse, function(nextStack, helperMissingString, id) {
-        this.source.push("else { " + nextStack + " = helpers.blockHelperMissing.call(" + helperMissingString + "); }");
+      this.populateParams(paramSize, null, mainProgram, inverse, hasHash, function(nextStack, helperMissingString, id) {
+        if (!this.usingKnownHelper) {
+          this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+          this.source.push("else { " + nextStack + " = blockHelperMissing.call(" + helperMissingString + "); }");
+        }
       });
     },
 
-    populateParams: function(paramSize, helperId, program, inverse, fn) {
+    populateParams: function(paramSize, helperId, program, inverse, hasHash, fn) {
+      var needsRegister = hasHash || this.options.stringParams || inverse || this.options.data;
       var id = this.popStack(), nextStack;
-      var params = [], param, stringParam;
+      var params = [], param, stringParam, stringOptions;
 
-      var hash = this.popStack();
+      if (needsRegister) {
+        this.register('tmp1', program);
+        stringOptions = 'tmp1';
+      } else {
+        stringOptions = '{ hash: {} }';
+      }
 
-      this.register('tmp1', program);
-      this.source.push('tmp1.hash = ' + hash + ';');
+      if (needsRegister) {
+        var hash = (hasHash ? this.popStack() : '{}');
+        this.source.push('tmp1.hash = ' + hash + ';');
+      }
 
       if(this.options.stringParams) {
         this.source.push('tmp1.contexts = [];');
@@ -1258,35 +1347,29 @@ Handlebars.JavaScriptCompiler = function() {};
         this.source.push('tmp1.data = data;');
       }
 
-      params.push('tmp1');
-
-      // TODO: This is legacy behavior. Deprecate and remove.
-      if(inverse) {
-        params.push(inverse);
-      }
+      params.push(stringOptions);
 
       this.populateCall(params, id, helperId || id, fn);
     },
 
     populateCall: function(params, id, helperId, fn) {
-      var paramString = ["context"].concat(params).join(", ");
-      var helperMissingString = ["context"].concat(helperId).concat(params).join(", ");
+      var paramString = ["depth0"].concat(params).join(", ");
+      var helperMissingString = ["depth0"].concat(helperId).concat(params).join(", ");
 
-      nextStack = this.nextStack();
+      var nextStack = this.nextStack();
 
-      this.source.push("if(typeof " + id + " === 'function') { " + nextStack + " = " + id + ".call(" + paramString + "); }");
+      if (this.usingKnownHelper) {
+        this.source.push(nextStack + " = " + id + ".call(" + paramString + ");");
+      } else {
+        this.context.aliases.functionType = '"function"';
+        this.source.push("if(typeof " + id + " === functionType) { " + nextStack + " = " + id + ".call(" + paramString + "); }");
+      }
       fn.call(this, nextStack, helperMissingString, id);
-    },
-
-    invokeInverse: function(guid) {
-      var program = this.programExpression(guid);
-
-      var blockMissingParams = ["context", this.topStack(), "this.noop", program];
-      this.pushStack("helpers.blockHelperMissing.call(" + blockMissingParams.join(", ") + ")");
+      this.usingKnownHelper = false;
     },
 
     invokePartial: function(context) {
-      this.pushStack("this.invokePartial(" + this.nameLookup('partials', context, 'partial') + ", '" + context + "', " + this.popStack() + ", helpers, partials);");
+      this.pushStack("self.invokePartial(" + this.nameLookup('partials', context, 'partial') + ", '" + context + "', " + this.popStack() + ", helpers, partials);");
     },
 
     assignToHash: function(key) {
@@ -1302,48 +1385,38 @@ Handlebars.JavaScriptCompiler = function() {};
 
     compileChildren: function(environment, options) {
       var children = environment.children, child, compiler;
-      var compiled = [];
 
       for(var i=0, l=children.length; i<l; i++) {
         child = children[i];
         compiler = new this.compiler();
 
-        compiled[i] = compiler.compile(child, options);
+        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
+        var index = this.context.programs.length;
+        child.index = index;
+        child.name = 'program' + index;
+        this.context.programs[index] = compiler.compile(child, options, this.context);
       }
-
-      environment.rawChildren = children;
-      environment.children = compiled;
     },
 
     programExpression: function(guid) {
-      if(guid == null) { return "this.noop"; }
+      if(guid == null) { return "self.noop"; }
 
-      var programParams = [guid, "helpers", "partials"];
-
-      var depths = this.environment.rawChildren[guid].depths.list;
-
-      if(this.options.data) { programParams.push("data"); }
+      var child = this.environment.children[guid],
+          depths = child.depths.list;
+      var programParams = [child.index, child.name, "data"];
 
       for(var i=0, l = depths.length; i<l; i++) {
         depth = depths[i];
 
-        if(depth === 1) { programParams.push("context"); }
+        if(depth === 1) { programParams.push("depth0"); }
         else { programParams.push("depth" + (depth - 1)); }
       }
 
-      if(!this.environment.usePartial) {
-        if(programParams[3]) {
-          programParams[2] = "null";
-        } else {
-          programParams.pop();
-        }
-      }
-
       if(depths.length === 0) {
-        return "this.program(" + programParams.join(", ") + ")";
+        return "self.program(" + programParams.join(", ") + ")";
       } else {
-        programParams[0] = "this.children[" + guid + "]";
-        return "this.programWithDepth(" + programParams.join(", ") + ")";
+        programParams.shift();
+        return "self.programWithDepth(" + programParams.join(", ") + ")";
       }
     },
 
@@ -1353,9 +1426,9 @@ Handlebars.JavaScriptCompiler = function() {};
     },
 
     useRegister: function(name) {
-      if(!this.registers[name]) {
-        this.registers[name] = true;
-        this.registers.list.push(name);
+      if(!this.context.registers[name]) {
+        this.context.registers[name] = true;
+        this.context.registers.list.push(name);
       }
     },
 
@@ -1380,7 +1453,7 @@ Handlebars.JavaScriptCompiler = function() {};
 
     quotedString: function(str) {
       return '"' + str
-        .replace(/\\/, '\\\\')
+        .replace(/\\/g, '\\\\')
         .replace(/"/g, '\\"')
         .replace(/\n/g, '\\n')
         .replace(/\r/g, '\\r') + '"';
@@ -1388,48 +1461,111 @@ Handlebars.JavaScriptCompiler = function() {};
   };
 
   var reservedWords = ("break case catch continue default delete do else finally " +
-                       "for function if in instanceof new return switch this throw " + 
-                       "try typeof var void while with null true false extends").split(" ");
+                       "for function if in instanceof new return switch this throw " +
+                       "try typeof var void while with null true false").split(" ");
 
-  compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
+  var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
 
   for(var i=0, l=reservedWords.length; i<l; i++) {
     compilerWords[reservedWords[i]] = true;
   }
 
+    JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
+        if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
+            return true;
+        }
+        return false;
+    }
+
 })(Handlebars.Compiler, Handlebars.JavaScriptCompiler);
 
+Handlebars.precompile = function(string, options) {
+  options = options || {};
+
+  var ast = Handlebars.parse(string);
+  var environment = new Handlebars.Compiler().compile(ast, options);
+  return new Handlebars.JavaScriptCompiler().compile(environment, options);
+};
+
+Handlebars.compile = function(string, options) {
+  options = options || {};
+
+  var compiled;
+  function compile() {
+    var ast = Handlebars.parse(string);
+    var environment = new Handlebars.Compiler().compile(ast, options);
+    var templateSpec = new Handlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
+    return Handlebars.template(templateSpec);
+  }
+
+  // Template is only compiled on first use and cached after that point.
+  return function(context, options) {
+    if (!compiled) {
+      compiled = compile();
+    }
+    return compiled.call(this, context, options);
+  };
+};
+;
+// lib/handlebars/vm.js
 Handlebars.VM = {
-  programWithDepth: function(fn) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return function(context, helpers, partials, data) {
-      args[0] = helpers || args[0];
-      args[1] = partials || args[1];
-      args[2] = data || args[2];
-      return fn.apply(this, [context].concat(args));
+  template: function(templateSpec) {
+    // Just add water
+    var container = {
+      escapeExpression: Handlebars.Utils.escapeExpression,
+      invokePartial: Handlebars.VM.invokePartial,
+      programs: [],
+      program: function(i, fn, data) {
+        var programWrapper = this.programs[i];
+        if(data) {
+          return Handlebars.VM.program(fn, data);
+        } else if(programWrapper) {
+          return programWrapper;
+        } else {
+          programWrapper = this.programs[i] = Handlebars.VM.program(fn);
+          return programWrapper;
+        }
+      },
+      programWithDepth: Handlebars.VM.programWithDepth,
+      noop: Handlebars.VM.noop
+    };
+
+    return function(context, options) {
+      options = options || {};
+      return templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
     };
   },
-  program: function(fn, helpers, partials, data) {
-    return function(context, h2, p2, d2) {
-      return fn(context, h2 || helpers, p2 || partials, d2 || data);
+
+  programWithDepth: function(fn, data, $depth) {
+    var args = Array.prototype.slice.call(arguments, 2);
+
+    return function(context, options) {
+      options = options || {};
+
+      return fn.apply(this, [context, options.data || data].concat(args));
     };
   },
-  noop: function() { return ""; },
-  compile: function(string, options) {
-    var ast = Handlebars.parse(string);
-    var environment = new Handlebars.Compiler().compile(ast, options);
-    return new Handlebars.JavaScriptCompiler().compile(environment, options);
+  program: function(fn, data) {
+    return function(context, options) {
+      options = options || {};
+
+      return fn(context, options.data || data);
+    };
   },
+  noop: function() { return ""; },
   invokePartial: function(partial, name, context, helpers, partials) {
     if(partial === undefined) {
       throw new Handlebars.Exception("The partial " + name + " could not be found");
     } else if(partial instanceof Function) {
-      return partial(context, helpers, partials);
+      return partial(context, {helpers: helpers, partials: partials});
+    } else if (!Handlebars.compile) {
+      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in vm mode");
     } else {
-      partials[name] = Handlebars.VM.compile(partial);
-      return partials[name](context, helpers, partials);
+      partials[name] = Handlebars.compile(partial);
+      return partials[name](context, {helpers: helpers, partials: partials});
     }
   }
 };
 
-Handlebars.compile = Handlebars.VM.compile;;
+Handlebars.template = Handlebars.VM.template;
+;