psimsa/handlebars.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:tommydudebreaux/handlebars.js into tommydudebreaux-master

Browse Source
This commit is contained in:
kpdecker
2013-02-15 19:24:15 -06:00
parent bc8214cb7c 7f9e3fea81
commit f72cbed479
11 changed files with 102 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/handlebars.js
Vendored
+12 -13
View File
@@ -24,10 +24,7 @@ THE SOFTWARE.
// lib/handlebars/base.js
/*jshint eqnull:true*/
this.Handlebars = {};
(function(Handlebars) {
var Handlebars = {};
Handlebars.VERSION = "1.0.0-rc.3";
Handlebars.COMPILER_REVISION = 2;
@@ -169,8 +166,6 @@ Handlebars.registerHelper('log', function(context, options) {
var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
Handlebars.log(level, context);
});
}(this.Handlebars));
;
// lib/handlebars/compiler/parser.js
/* Jison generated parser */
@@ -646,6 +641,7 @@ function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Pa
return new Parser;
})();;
// lib/handlebars/compiler/base.js
Handlebars.Parser = handlebars;
Handlebars.parse = function(input) {
@@ -699,13 +695,13 @@ Handlebars.print = function(ast) {
this.context = context;
};
var verifyMatch = function(open, close) {
if(open.original !== close.original) {
throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
}
};
Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
var verifyMatch = function(open, close) {
if(open.original !== close.original) {
throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
}
};
verifyMatch(mustache.id, close);
this.type = "block";
this.mustache = mustache;
@@ -851,7 +847,8 @@ Handlebars.SafeString.prototype.toString = function() {
}
}
};
})();;
})();
;
// lib/handlebars/compiler/compiler.js
/*jshint eqnull:true*/
@@ -2114,8 +2111,10 @@ Handlebars.compile = function(input, options) {
return compiled.call(this, context, options);
};
};
;
// lib/handlebars/runtime.js
Handlebars.VM = {
template: function(templateSpec) {
// Just add water
lib/handlebars.js
+23 -5
View File
@@ -1,14 +1,32 @@
var Handlebars = require("./handlebars/base");
module.exports = Handlebars;
var handlebars = require("./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)
require("./handlebars/utils");
utils = require("./handlebars/utils"),
compiler = require("./handlebars/compiler"),
runtime = require("./handlebars/runtime");
require("./handlebars/compiler");
require("./handlebars/runtime");
var create = function() {
var hb = handlebars.create();
utils.attach(hb);
compiler.attach(hb);
runtime.attach(hb);
return hb;
};
var Handlebars = create();
Handlebars.create = create;
module.exports = Handlebars; // instantiate an instance
// BEGIN(BROWSER)
// END(BROWSER)
// USAGE:
// var handlebars = require('handlebars');
// var singleton = handlebars.Handlebars,
// local = handlebars.create();
lib/handlebars/base.js
+7 -7
View File
@@ -1,9 +1,8 @@
module.exports.create = function() {
// BEGIN(BROWSER)
/*jshint eqnull:true*/
this.Handlebars = {};
(function(Handlebars) {
var Handlebars = {};
Handlebars.VERSION = "1.0.0-rc.3";
Handlebars.COMPILER_REVISION = 2;
@@ -146,9 +145,10 @@ Handlebars.registerHelper('log', function(context, options) {
Handlebars.log(level, context);
});
}(this.Handlebars));
// END(BROWSER)
return Handlebars;
};
module.exports = this.Handlebars;
lib/handlebars/compiler/ast.js
+10 -7
View File
@@ -1,4 +1,4 @@
var Handlebars = require('./base');
exports.attach = function(Handlebars) {
// BEGIN(BROWSER)
(function() {
@@ -39,13 +39,13 @@ var Handlebars = require('./base');
this.context = context;
};
var verifyMatch = function(open, close) {
if(open.original !== close.original) {
throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
}
};
Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
var verifyMatch = function(open, close) {
if(open.original !== close.original) {
throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
}
};
verifyMatch(mustache.id, close);
this.type = "block";
this.mustache = mustache;
@@ -131,3 +131,6 @@ var Handlebars = require('./base');
})();
// END(BROWSER)
return Handlebars;
};
lib/handlebars/compiler/base.js
+5 -2
View File
@@ -1,7 +1,9 @@
var handlebars = require("./parser");
var Handlebars = require("../base");
exports.attach = function(Handlebars) {
// BEGIN(BROWSER)
Handlebars.Parser = handlebars;
Handlebars.parse = function(input) {
@@ -18,4 +20,5 @@ Handlebars.print = function(ast) {
};
// END(BROWSER)
module.exports = Handlebars;
return Handlebars;
};
lib/handlebars/compiler/compiler.js
+11 -1
View File
@@ -1,4 +1,8 @@
var Handlebars = require("./base");
var compilerbase = require("./base");
exports.attach = function(Handlebars) {
compilerbase.attach(Handlebars);
// BEGIN(BROWSER)
@@ -1263,5 +1267,11 @@ Handlebars.compile = function(input, options) {
};
};
// END(BROWSER)
return Handlebars;
};
lib/handlebars/compiler/index.js
+14 -5
View File
@@ -1,7 +1,16 @@
// Each of these module will augment the Handlebars object as it loads. No need to perform addition operations
module.exports = require("./base");
require("./visitor");
require("./printer");
module.exports.attach = function(Handlebars) {
require("./ast");
require("./compiler");
var visitor = require("./visitor"),
printer = require("./printer"),
ast = require("./ast"),
compiler = require("./compiler");
visitor.attach(Handlebars);
printer.attach(Handlebars);
ast.attach(Handlebars);
compiler.attach(Handlebars);
return Handlebars;
};
lib/handlebars/compiler/printer.js
+5 -2
View File
@@ -1,6 +1,7 @@
var Handlebars = require("./base");
exports.attach = function(Handlebars) {
// BEGIN(BROWSER)
Handlebars.PrintVisitor = function() { this.padding = 0; };
Handlebars.PrintVisitor.prototype = new Handlebars.Visitor();
@@ -128,4 +129,6 @@ Handlebars.PrintVisitor.prototype.comment = function(comment) {
};
// END(BROWSER)
exports.PrintVisitor = Handlebars.PrintVisitor;
return Handlebars;
};
lib/handlebars/compiler/visitor.js
+6 -1
View File
@@ -1,4 +1,4 @@
var Handlebars = require("./base");
exports.attach = function(Handlebars) {
// BEGIN(BROWSER)
@@ -9,5 +9,10 @@ Handlebars.Visitor.prototype = {
return this[object.type](object);
}
};
// END(BROWSER)
return Handlebars;
};
lib/handlebars/runtime.js
+5 -1
View File
@@ -1,6 +1,7 @@
var Handlebars = require("./base");
exports.attach = function(Handlebars) {
// BEGIN(BROWSER)
Handlebars.VM = {
template: function(templateSpec) {
// Just add water
@@ -86,3 +87,6 @@ Handlebars.template = Handlebars.VM.template;
// END(BROWSER)
return Handlebars;
};
lib/handlebars/utils.js
+4 -1
View File
@@ -1,4 +1,4 @@
var Handlebars = require("./base");
exports.attach = function(Handlebars) {
// BEGIN(BROWSER)
@@ -63,5 +63,8 @@ Handlebars.SafeString.prototype.toString = function() {
}
};
})();
// END(BROWSER)
return Handlebars;
};