Merge pull request #10 from dizlexik/master

global and template contexts are now merged
cstivers78 · Sep 13, 2013 · 400a16d · 400a16d
2 parents e7d6f92 + 8c262aa
commit 400a16d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/bliss.js b/lib/bliss.js
diff --git a/src/bliss.coffee b/src/bliss.coffee
@@ -33,6 +33,7 @@ class Bliss
   compile: (source,options) ->
     self = @
     options = defaults options, @options
+    options.context = defaults options.context @options.context
     context = options.context
 
     context.render = (filename,args...) ->
@@ -69,6 +70,7 @@ class Bliss
       filename: filename,
       ext: if (p=filename.indexOf('.')) >= 0 then filename[p..] else ''
     }
+    options.context = defaults options.context @options.context
 
     filepath = filename
     stat = undefined