Merge 460e377 into 5343fc3

jekyll · Dec 11, 2014 · c8a31cc · c8a31cc
2 parents 5343fc3 + 460e377
commit c8a31cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
@@ -183,6 +183,7 @@ def read_directories(dir = '')
       end
 
       pages.sort_by!(&:name)
+      static_files.sort_by!(&:relative_path)
     end
 
     # Read all the files in <source>/<dir>/_posts and create a new Post
@@ -377,7 +378,7 @@ def site_payload
             "time"         => time,
             "posts"        => posts.sort { |a, b| b <=> a },
             "pages"        => pages,
-            "static_files" => static_files.sort { |a, b| a.relative_path <=> b.relative_path },
+            "static_files" => static_files,
             "html_pages"   => pages.select { |page| page.html? || page.url.end_with?("/") },
             "categories"   => post_attr_hash('categories'),
             "tags"         => post_attr_hash('tags'),

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
@@ -3,6 +3,8 @@ class StaticFile
     # The cache of last modification times [path] -> mtime.
     @@mtimes = Hash.new
 
+    attr_reader :relative_path
+
     # Initialize a new StaticFile.
     #
     # site - The Site.
@@ -15,18 +17,14 @@ def initialize(site, base, dir, name, collection = nil)
       @dir  = dir
       @name = name
       @collection = collection
+      @relative_path = File.join(*[@dir, @name].compact)
     end
 
     # Returns source file path.
     def path
       File.join(*[@base, @dir, @name].compact)
     end
 
-    # Returns the source file path relative to the site source
-    def relative_path
-      @relative_path ||= File.join(*[@dir, @name].compact)
-    end
-
     def extname
       File.extname(path)
     end