Permalink
Browse files

#3 - fixed resolving of partials (render call).

  • Loading branch information...
1 parent 793f4ec commit c326033eae8b87ed1e451b070c9402e710916552 @cstivers78 committed Jun 7, 2012
Showing with 241 additions and 109 deletions.
  1. +10 −5 lib/bliss.js
  2. +1 −0 lib/browser-head.js
  3. +1 −0 lib/browser-tail.js
  4. +119 −56 lib/browser.js
  5. +3 −2 lib/tags.js
  6. +77 −32 lib/tokenizer.js
  7. +4 −3 lib/validation.js
  8. +24 −9 lib/writer.js
  9. +1 −1 package.json
  10. +1 −1 src/bliss.coffee
View
@@ -1,5 +1,6 @@
+// Generated by CoffeeScript 1.3.3
var Bliss, Tokenizer, Writer, fs, path,
- __slice = Array.prototype.slice;
+ __slice = [].slice;
if (module !== void 0) {
fs = require('fs');
@@ -24,15 +25,17 @@ Bliss = (function() {
}
defaults = function() {
- var k, object, objects, result, v, _i, _len;
+ var k, object, objects, result, v, _i, _len, _ref;
objects = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
result = {};
for (_i = 0, _len = objects.length; _i < _len; _i++) {
object = objects[_i];
if (object != null) {
for (k in object) {
v = object[k];
- if (result[k] == null) result[k] = v;
+ if ((_ref = result[k]) == null) {
+ result[k] = v;
+ }
}
}
}
@@ -61,7 +64,7 @@ Bliss = (function() {
filepath = path.resolve(dirname, filename);
templateOptions = clone(options);
templateOptions.filename = filepath;
- template = self.compileFile(filename, options);
+ template = self.compileFile(filepath, options);
return template.apply(null, args);
};
writer = new Writer();
@@ -144,4 +147,6 @@ Bliss = (function() {
})();
-if (module !== void 0) module.exports = Bliss;
+if (module !== void 0) {
+ module.exports = Bliss;
+}
View
@@ -1,3 +1,4 @@
+// Generated by CoffeeScript 1.3.3
var module;
module = void 0;
View
@@ -1,3 +1,4 @@
+// Generated by CoffeeScript 1.3.3
this.Bliss = Bliss;
Oops, something went wrong. Retry.

0 comments on commit c326033

Please sign in to comment.