express-thunder - npm Package Compare versions

Comparing version 1.1.2 to 1.1.3

History.md

 # History
 
+## 1.1.3 / 2013-12-18
+
+- [bug fix] Use `/` to load partial from view root dir instead of current dir
+
+
+
 ## 1.1.2 / 2013-12-18
@@ -11,3 +17,3 @@
 
-- [bug fix] Use `/` to load partial from view root dir instead of current dir
+- [bug fix] Use `/` to load layout from view root dir instead of current dir
 
@@ -14,0 +20,0 @@

lib/express-thunder.js

@@ -92,5 +92,4 @@ var utils    = require( './utils' );
   utils.renderFile( file, options, function ( err, html ){
+    if( err ) return fn( err, html );
 
-    if( err ) return fn( err,html );
-
     var layout = options.locals._layoutFile;
@@ -104,2 +103,3 @@
       layout = options._layoutFile;
+      // layout = options.settings[ 'view options' ].layout;
     }
@@ -312,6 +312,11 @@
   // ( FIXME : filename is set by thunder engine, other engines may need more help )
-  var root = view[ 0 ] === path.sep
-    ? options.settings.views
-    : dirname( options.filename );
+  var root;
 
+  if( view[ 0 ] === path.sep ){
+    root = options.settings.views;
+    view = view.slice( 1 );
+  }else{
+    root = dirname( options.filename );
+  }
+
   var file = lookup( root, view, options );
@@ -318,0 +323,0 @@ var key  = file + ':string';

lib/utils.js

@@ -14,3 +14,3 @@ var fs      = require( 'fs' );
 /**
- * Clear intermediate js cache.
+ * Clear intermediate thunder cache.
  *
@@ -27,3 +27,3 @@ * @api public
 /**
- * Render the given `str` of ejs.
+ * Render the given `str` of html.
  *
@@ -65,3 +65,3 @@ * Options:
 /**
- * Render an EJS file at the given `path` and callback `fn(err, str)`.
+ * Render an thunder file at the given `path` and callback `fn( err, str )`.
  *
@@ -85,3 +85,3 @@ * @param {String} path
 
-    try {
+    try{
       str = options.cache
@@ -88,0 +88,0 @@ ? cache[ key ] || ( cache[ key ] = read( path, 'utf8' ))

package.json

 {
-  "version"      : "1.1.2",
+  "version"      : "1.1.3",
   "name"         : "express-thunder",
@@ -4,0 +4,0 @@ "description"  : "Express 3.x locals for layout, partial and blocks for thunder template engine.",

No alert changes

Improved metrics

Total package byte prevSize

39523

increased by0.6%

Lines of code

911

increased by0.55%

No dependency changes