sproutcore 1.5.0.pre.4.1 → 1.5.0.pre.5

data/lib/frameworks/sproutcore/frameworks/handlebars/extensions/collection.js

@@ -0,0 +1,75 @@
+sc_require('extensions');
+
+Handlebars.registerHelper('collection', function(path, fn, inverse) {
+  var data = fn.data;
+  var collectionClass;
+
+  if(!data) {
+    data = fn;
+    fn = null;
+  }
+
+  if(typeof path === "string") {
+    collectionClass = SC.objectForPropertyPath(path) || SC.TemplateCollectionView;
+  } else {
+    collectionClass = path;
+  }
+
+  var hash = fn.hash, itemHash = {}, match;
+
+  for (var prop in hash) {
+    if (fn.hash.hasOwnProperty(prop)) {
+      match = prop.match(/^item(.)(.*)$/);
+
+      if(match) {
+        itemHash[match[1].toLowerCase() + match[2]] = hash[prop];
+        delete hash[prop];
+      }
+    }
+  }
+
+  if(fn) {
+    var collectionObject = collectionClass;
+
+    if(collectionObject.isClass) {
+      collectionObject = collectionObject.prototype;
+    }
+
+    collectionObject.itemViewTemplate = fn;
+    collectionObject.inverseTemplate = inverse;
+    collectionObject.itemViewOptions = itemHash;
+  }
+
+  var noop = function() { return ""; };
+
+  noop.data = fn.data;
+  noop.hash = fn.hash;
+  noop.fn = noop;
+
+  return Handlebars.helpers.view.call(this, collectionClass, noop);
+});
+
+Handlebars.registerHelper('bindCollection', function(path, bindingString, fn) {
+  var data = fn.data;
+  var inverse = fn.data;
+  var collectionClass = SC.objectForPropertyPath(path) || SC.TemplateCollectionView;
+  var binding = SC.Binding.from(bindingString, this);
+
+  if(!data) {
+    data = fn;
+    fn = null;
+  }
+
+  if(fn) {
+    // attach the function to the original class so it can be used recursively
+    collectionClass.prototype.itemViewTemplate = fn;
+  }
+
+  if(collectionClass.isClass) {
+    collectionClass = collectionClass.extend({ contentBinding: binding });
+  } else {
+    collectionClass.bindings.push( binding.to('content', collectionClass) );
+  }
+
+  return Handlebars.helpers.collection.call(this, collectionClass, fn);
+});

data/lib/frameworks/sproutcore/frameworks/handlebars/extensions/localization.js

@@ -0,0 +1,5 @@
+sc_require('extensions');
+
+Handlebars.registerHelper('loc', function(property) {
+  return property.loc();
+});

data/lib/frameworks/sproutcore/frameworks/handlebars/extensions/view.js

@@ -0,0 +1,115 @@
+sc_require('extensions');
+
+SC.Handlebars.ViewHelper = SC.Object.create({
+  helper: function(thisContext, path, options) {
+    var inverse = options.inverse;
+    var data = options.data;
+    var view = data.view;
+    var fn = options.fn;
+
+    var newView;
+    if (path.isClass || path.isObject) {
+     newView = path;
+     if (!newView) {
+      throw "Null or undefined object was passed to the #view helper. Did you mean to pass a property path string?";
+     }
+    } else {
+      // Path is relative, look it up with this view as the root
+      if (path.charAt(0) === '.') {
+        newView = SC.objectForPropertyPath(path.slice(1), view);
+      } else {
+        // Path is absolute, look up path on global (window) object
+        newView = SC.objectForPropertyPath(path);
+      }
+      if (!newView) { throw "Unable to find view at path '" + path + "'"; }
+    }
+
+    var currentView = data.view;
+
+    var childViews = currentView.get('childViews');
+    var childView = currentView.createChildView(newView);
+
+    // Set the template of the view to the passed block if we got one
+    if (fn) { childView.template = fn; }
+
+
+    childViews.pushObject(childView);
+
+    var context = SC.RenderContext(childView.get('tagName'));
+
+    // Add id and class names passed to view helper
+    this.applyAttributes(options.hash, childView, context);
+
+    childView.applyAttributesToContext(context);
+
+
+    // tomdale wants to make SproutCore slow
+    childView.render(context, YES);
+
+    return new Handlebars.SafeString(context.join());
+  },
+
+  applyAttributes: function(options, childView, context) {
+    var id = options.id;
+    var classNames = options['class'];
+
+    if (classNames) {
+      context.addClass(classNames.split(' '));
+    }
+
+    if (id) {
+      childView.set('layerId', id);
+      context.id(id);
+    }
+
+    var classBindings = options.classBinding;
+    if (classBindings) {
+      this.addClassBindings(classBindings, childView, context);
+    }
+  },
+
+  addClassBindings: function(classBindings, view, context) {
+    var classObservers = view._classObservers;
+
+    // Teardown any existing observers on the view.
+    if (classObservers) {
+      for (var prop in classObservers) {
+        if (classObservers.hasOwnProperty(prop)) {
+          view.removeObserver(prop, classObservers[prop]);
+        }
+      }
+    }
+
+    classObservers = view._classObservers = {};
+
+    // For each property passed, loop through and setup
+    // an observer.
+    classBindings.split(' ').forEach(function(property) {
+      // Normalize property path to be suitable for use
+      // as a class name. For exaple, content.foo.barBaz
+      // becomes bar-baz.
+
+      var dasherizedProperty = property.split('.').get('lastObject');
+      dasherizedProperty = dasherizedProperty.dasherize();
+
+      // Set up an observer on the view. If the bound property
+      // changes, toggle the class name
+      var observer = classObservers[property] = function() {
+        var shouldDisplay = view.getPath(property);
+        var elem = view.$();
+
+        elem.toggleClass(dasherizedProperty, shouldDisplay);
+      };
+
+      view.addObserver(property, observer);
+
+      // Add the class name to the view
+      context.setClass(dasherizedProperty, view.getPath(property));
+    });
+  }
+});
+
+
+Handlebars.registerHelper('view', function(path, options) {
+  return SC.Handlebars.ViewHelper.helper(this, path, options);
+});

data/lib/frameworks/sproutcore/frameworks/handlebars/handlebars.js

@@ -3,9 +3,9 @@
 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,"param":26,"STRING":27,"pathSegments":28,"SEP":29,"ID":30,"$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",27:"STRING",29:"SEP",30:"ID"},
-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,2],[17,1],[25,2],[25,1],[26,1],[26,1],[21,1],[28,3],[28,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,"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]],
 performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
 
 var $0 = $$.length - 1;
@@ -34,15 +34,15 @@ case 11: this.$ = new yy.ContentNode($$[$0])
 break;
 case 12: this.$ = new yy.CommentNode($$[$0]) 
 break;
-case 13: this.$ = new yy.MustacheNode($$[$0-1]) 
+case 13: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]) 
 break;
-case 14: this.$ = new yy.MustacheNode($$[$0-1]) 
+case 14: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]) 
 break;
 case 15: this.$ = $$[$0-1] 
 break;
-case 16: this.$ = new yy.MustacheNode($$[$0-1]) 
+case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]) 
 break;
-case 17: this.$ = new yy.MustacheNode($$[$0-1], true) 
+case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true) 
 break;
 case 18: this.$ = new yy.PartialNode($$[$0-1]) 
 break;
@@ -50,28 +50,42 @@ case 19: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1])
 break;
 case 20: 
 break;
-case 21: this.$ = [$$[$0-1]].concat($$[$0]) 
+case 21: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]] 
 break;
-case 22: this.$ = [$$[$0]] 
+case 22: this.$ = [[$$[$0-1]].concat($$[$0]), null] 
 break;
-case 23: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
+case 23: this.$ = [[$$[$0-1]], $$[$0]] 
 break;
-case 24: this.$ = [$$[$0]] 
+case 24: this.$ = [[$$[$0]], null] 
 break;
-case 25: this.$ = $$[$0] 
+case 25: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
 break;
-case 26: this.$ = new yy.StringNode($$[$0]) 
+case 26: this.$ = [$$[$0]] 
 break;
-case 27: this.$ = new yy.IdNode($$[$0]) 
+case 27: this.$ = $$[$0] 
 break;
-case 28: $$[$0-2].push($$[$0]); this.$ = $$[$0-2]; 
+case 28: this.$ = new yy.StringNode($$[$0]) 
 break;
-case 29: this.$ = [$$[$0]] 
+case 29: this.$ = new yy.HashNode($$[$0]) 
+break;
+case 30: $$[$0-1].push($$[$0]); this.$ = $$[$0-1] 
+break;
+case 31: this.$ = [$$[$0]] 
+break;
+case 32: this.$ = [$$[$0-2], $$[$0]] 
+break;
+case 33: this.$ = [$$[$0-2], new yy.StringNode($$[$0])] 
+break;
+case 34: this.$ = new yy.IdNode($$[$0]) 
+break;
+case 35: $$[$0-2].push($$[$0]); this.$ = $$[$0-2]; 
+break;
+case 36: 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,28:24,30:[1,25]},{17:26,21:23,28:24,30:[1,25]},{17:27,21:23,28:24,30:[1,25]},{17:28,21:23,28:24,30:[1,25]},{21:29,28:24,30:[1,25]},{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,28:24,30:[1,25]},{10:32,20:[1,33]},{10:34,20:[1,33]},{18:[1,35]},{18:[2,22],21:38,25:36,26:37,27:[1,39],28:24,30:[1,25]},{18:[2,27],27:[2,27],29:[1,40],30:[2,27]},{18:[2,29],27:[2,29],29:[2,29],30:[2,29]},{18:[1,41]},{18:[1,42]},{18:[1,43]},{18:[1,44],21:45,28:24,30:[1,25]},{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:46,28:24,30:[1,25]},{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,21],21:38,26:47,27:[1,39],28:24,30:[1,25]},{18:[2,24],27:[2,24],30:[2,24]},{18:[2,25],27:[2,25],30:[2,25]},{18:[2,26],27:[2,26],30:[2,26]},{30:[1,48]},{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,49]},{18:[1,50]},{18:[2,23],27:[2,23],30:[2,23]},{18:[2,28],27:[2,28],29:[2,28],30:[2,28]},{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]}],
-defaultActions: {16:[2,1]},
+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]},
 parseError: function parseError(str, hash) {
     throw new Error(str);
 },
@@ -225,7 +239,7 @@ parse: function parse(input) {
                     first_line: lstack[lstack.length-(len||1)].first_line,
                     last_line: lstack[lstack.length-1].last_line,
                     first_column: lstack[lstack.length-(len||1)].first_column,
-                    last_column: lstack[lstack.length-1].last_column,
+                    last_column: lstack[lstack.length-1].last_column
                 };
                 r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
 
@@ -394,31 +408,39 @@ case 9: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.begin("INITIAL"); r
 break;
 case 10: return 22; 
 break;
-case 11: return 29; 
+case 11: return 32; 
+break;
+case 12: return 31; 
+break;
+case 13: return 31; 
 break;
-case 12: /*ignore whitespace*/ 
+case 14: return 34; 
 break;
-case 13: this.begin("INITIAL"); return 18; 
+case 15: /*ignore whitespace*/ 
 break;
-case 14: this.begin("INITIAL"); return 18; 
+case 16: this.begin("INITIAL"); return 18; 
 break;
-case 15: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 27; 
+case 17: this.begin("INITIAL"); return 18; 
 break;
-case 16: return 30; 
+case 18: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28; 
 break;
-case 17: return 'INVALID'; 
+case 19: return 31; 
 break;
-case 18: return 5; 
+case 20: return 'INVALID'; 
+break;
+case 21: 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],"inclusive":false},"INITIAL":{"rules":[0,1,18],"inclusive":true}};return lexer;})()
+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;})()
 parser.lexer = lexer;
 return parser;
 })();
 // lib/handlebars/base.js
-window.Handlebars = {};
+
+// Support for node.js and Spade
+var Handlebars = (typeof exports !== 'undefined') ? exports : {};
 
 Handlebars.Parser = handlebars;
 
@@ -538,10 +560,11 @@ Handlebars.log = function(level, str) { Handlebars.logger.log(level, str); };
     if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); }
   };
 
-  Handlebars.AST.MustacheNode = function(params, unescaped) {
+  Handlebars.AST.MustacheNode = function(params, hash, unescaped) {
     this.type = "mustache";
     this.id = params[0];
     this.params = params.slice(1);
+    this.hash = hash;
     this.escaped = !unescaped;
   };
 
@@ -579,6 +602,11 @@ Handlebars.log = function(level, str) { Handlebars.logger.log(level, str); };
     this.string = string;
   };
 
+  Handlebars.AST.HashNode = function(pairs) {
+    this.type = "hash";
+    this.pairs = pairs;
+  };
+
   Handlebars.AST.IdNode = function(parts) {
     this.type = "ID";
     this.original = parts.join("/");
@@ -691,7 +719,8 @@ Handlebars.JavaScriptCompiler = function() {};
     invokeProgram: 11,
     invokePartial: 12,
     push: 13,
-    invokeInverse: 14
+    invokeInverse: 14,
+    assignToHash: 15
   };
 
   Compiler.MULTI_PARAM_OPCODES = {
@@ -706,7 +735,8 @@ Handlebars.JavaScriptCompiler = function() {};
     invokeProgram: 2,
     invokePartial: 1,
     push: 1,
-    invokeInverse: 1
+    invokeInverse: 1,
+    assignToHash: 1
   };
 
   Compiler.DISASSEMBLE_MAP = {};
@@ -805,20 +835,14 @@ Handlebars.JavaScriptCompiler = function() {};
 
     block: function(block) {
       var mustache = block.mustache;
-      var params = mustache.params, depth, child, inverse, inverseGuid;
+      var depth, child, inverse, inverseGuid;
 
-      this.pushParams(params);
-
-      // ID lookup is now on the stack
-      this.ID(mustache.id);
+      var params = this.setupStackForMustache(mustache);
 
       var programGuid = this.compileProgram(block.program);
 
       if(block.program.inverse) {
         inverseGuid = this.compileProgram(block.program.inverse);
-      }
-
-      if(block.program.inverse) {
         this.declare('inverse', inverseGuid);
       }
 
@@ -835,6 +859,20 @@ Handlebars.JavaScriptCompiler = function() {};
       this.opcode('append');
     },
 
+    hash: function(hash) {
+      var pairs = hash.pairs, pair, val;
+
+      this.opcode('push', '{}');
+
+      for(var i=0, l=pairs.length; i<l; i++) {
+        pair = pairs[i];
+        val  = pair[1];
+
+        this.accept(val);
+        this.opcode('assignToHash', pair[0]);
+      }
+    },
+
     partial: function(partial) {
       var id = partial.id;
       this.usePartial = true;
@@ -854,10 +892,7 @@ Handlebars.JavaScriptCompiler = function() {};
     },
 
     mustache: function(mustache) {
-      var params = mustache.params;
-
-      this.pushParams(params);
-      this.ID(mustache.id);
+      var params = this.setupStackForMustache(mustache);
 
       this.opcode('invokeMustache', params.length, mustache.id.original);
 
@@ -886,6 +921,7 @@ Handlebars.JavaScriptCompiler = function() {};
 
     comment: function() {},
 
+    // HELPERS
     pushParams: function(params) {
       var i = params.length, param;
 
@@ -914,6 +950,22 @@ Handlebars.JavaScriptCompiler = function() {};
         this.depths[depth] = true;
         this.depths.list.push(depth);
       }
+    },
+
+    setupStackForMustache: function(mustache) {
+      var params = mustache.params;
+
+      this.pushParams(params);
+
+      if(mustache.hash) {
+        this.hash(mustache.hash);
+      } else {
+        this.opcode('push', '{}');
+      }
+
+      this.ID(mustache.id);
+
+      return params;
     }
   };
 
@@ -1134,58 +1186,62 @@ Handlebars.JavaScriptCompiler = function() {};
     },
 
     invokeMustache: function(paramSize, original) {
-      var params = ["context"], fn, slot;
-
-      fn = this.popStack();
-
-      for(var i=0; i<paramSize; i++) {
-        params.push(this.popStack());
-      }
-
-      if(this.data) { params.push("data"); }
-
-      var paramString = params.join(", ");
-      var helperMissing = ["context"].concat(this.quotedString(original)).concat(params.slice(1));
-
-      slot = this.nextStack();
-
-      if(paramSize === 0) {
-        // TODO: This case is not listed in the mustache spec. Is it important?
-        this.source.push("if(typeof " + fn + " === 'function') { " + slot + " = " + fn + ".call(" + paramString + "); }");
-      } else {
-        this.source.push("if(typeof " + fn + " === 'function') { " + slot + " = " + fn + ".call(" + paramString + "); } else { " + slot + " = helpers.helperMissing.call(" + helperMissing + ") }");
-      }
+      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 + "; }");
+      });
     },
 
     invokeProgram: function(guid, paramSize) {
       var inverse = this.programExpression(this.inverse);
+      var mainProgram = this.programExpression(guid);
 
-      var fn = this.popStack();
-      var id = fn;
+      this.populateParams(paramSize, null, mainProgram, inverse, function(nextStack, helperMissingString, id) {
+        this.source.push("else { " + nextStack + " = helpers.blockHelperMissing.call(" + helperMissingString + "); }");
+      });
+    },
 
-      var params = ["context"];
-      var blockMissingParams = ["context", id];
+    populateParams: function(paramSize, helperId, program, inverse, fn) {
+      var id = this.popStack(), nextStack;
+      var params = [];
+
+      var hash = this.popStack();
 
       for(var i=0; i<paramSize; i++) {
         var param = this.popStack();
         params.push(param);
-        blockMissingParams.push(param);
       }
 
-      var mainProgram = this.programExpression(guid);
+      this.register('tmp1', program);
+      this.source.push('tmp1.hash = ' + hash + ';');
 
-      params.push(mainProgram, inverse);
-      blockMissingParams.push(mainProgram, inverse);
+      if(inverse) {
+        this.source.push('tmp1.fn = tmp1;');
+        this.source.push('tmp1.inverse = ' + inverse + ';');
+      }
 
       if(this.data) {
-        params.push("data");
-        blockMissingParams.push("data");
+        this.source.push('tmp1.data = data;');
       }
 
-      var nextStack = this.nextStack();
+      params.push('tmp1');
 
-      this.source.push("if(typeof " + id + " === 'function') { " + nextStack + " = " + id + ".call(" + params.join(", ") + "); }");
-      this.source.push("else { " + nextStack + " = helpers.blockHelperMissing.call(" + blockMissingParams.join(", ") + "); }");
+      // TODO: This is legacy behavior. Deprecate and remove.
+      if(inverse) {
+        params.push(inverse);
+      }
+
+      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(", ");
+
+      nextStack = this.nextStack();
+
+      this.source.push("if(typeof " + id + " === 'function') { " + nextStack + " = " + id + ".call(" + paramString + "); }");
+      fn.call(this, nextStack, helperMissingString, id);
     },
 
     invokeInverse: function(guid) {
@@ -1199,6 +1255,13 @@ Handlebars.JavaScriptCompiler = function() {};
       this.pushStack("this.invokePartial(" + this.nameLookup('partials', context, 'partial') + ", '" + context + "', " + this.popStack() + ", helpers, partials);");
     },
 
+    assignToHash: function(key) {
+      var value = this.popStack();
+      var hash = this.topStack();
+
+      this.source.push(hash + "['" + key + "'] = " + value + ";");
+    },
+
     // HELPERS
 
     compiler: JavaScriptCompiler,
@@ -1335,4 +1398,4 @@ Handlebars.VM = {
   }
 };
 
-Handlebars.compile = Handlebars.VM.compile;;
+Handlebars.compile = Handlebars.VM.compile;