From d4eb42f27fb6a4957391d3b6c4685d544cce065b Mon Sep 17 00:00:00 2001
From: Nico Hagenburger <nico@hagenburger.net>
Date: Sat, 1 Jan 2011 23:00:09 +0100
Subject: [PATCH 1/2] fixed loading of layouts for js and css

---
 lib/middleman/server.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/middleman/server.rb b/lib/middleman/server.rb
index a496485b..a1111f3c 100644
--- a/lib/middleman/server.rb
+++ b/lib/middleman/server.rb
@@ -97,7 +97,7 @@ module Middleman
     def self.page(url, options={}, &block)
       url << settings.index_file if url.match(%r{/$})
   
-      options[:layout] ||= current_layout
+      options[:layout] = current_layout if options[:layout].nil?
       get(url) do
         return yield if block_given?
         process_request(options)
@@ -119,7 +119,9 @@ module Middleman
       
       old_layout = settings.current_layout
       settings.layout(options[:layout]) if !options[:layout].nil?
-      result = render(path, :layout => settings.fetch_layout_path.to_sym)
+      layout = settings.fetch_layout_path.to_sym
+      layout = false if options[:layout] == false or path =~ /\.(css|js)$/
+      result = render(path, :layout => layout, :layout_engine => options[:layout_engine])
       settings.layout(old_layout)
       
       if result

From 3e767a27954984211c695c739e90edd1311288de Mon Sep 17 00:00:00 2001
From: Nico Hagenburger <nico@hagenburger.net>
Date: Sat, 1 Jan 2011 23:07:37 +0100
Subject: [PATCH 2/2] allow to include own file extentions (create list after
 running config.rb)

---
 lib/middleman/builder.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/middleman/builder.rb b/lib/middleman/builder.rb
index 3e2d4143..78825415 100644
--- a/lib/middleman/builder.rb
+++ b/lib/middleman/builder.rb
@@ -6,9 +6,6 @@ require 'middleman/templater+dynamic_renderer.rb'
 module Middleman
   class Builder < ::Templater::Generator
     
-    # Support all Tilt-enabled templates and treat js like a template
-    @@template_extensions = ::Tilt.mappings.keys << "js"
-    
     # Define source and desintation
     def self.source_root; Dir.pwd; end
     def destination_root; File.join(Dir.pwd, Middleman::Server.build_dir); end
@@ -43,6 +40,8 @@ module Middleman
     end
 
     def self.init!
+      # Support all Tilt-enabled templates and treat js like a template
+      @@template_extensions ||= ::Tilt.mappings.keys << "js"
       glob! File.basename(Middleman::Server.public),  @@template_extensions
       glob! File.basename(Middleman::Server.views),   @@template_extensions
     end