Merge branch 'delftswa2014-remove-unused-method'
* delftswa2014-remove-unused-method: static_file: extract extname in initializer and save as variable. #3632 removed unused method StaticFile::extname
This commit is contained in:
commit
eeb13872e3
|
@ -3,7 +3,7 @@ module Jekyll
|
|||
# The cache of last modification times [path] -> mtime.
|
||||
@@mtimes = Hash.new
|
||||
|
||||
attr_reader :relative_path
|
||||
attr_reader :relative_path, :extname
|
||||
|
||||
# Initialize a new StaticFile.
|
||||
#
|
||||
|
@ -18,6 +18,7 @@ module Jekyll
|
|||
@name = name
|
||||
@collection = collection
|
||||
@relative_path = File.join(*[@dir, @name].compact)
|
||||
@extname = File.extname(@relative_path)
|
||||
end
|
||||
|
||||
# Returns source file path.
|
||||
|
@ -25,10 +26,6 @@ module Jekyll
|
|||
File.join(*[@base, @dir, @name].compact)
|
||||
end
|
||||
|
||||
def extname
|
||||
File.extname(path)
|
||||
end
|
||||
|
||||
# Obtain destination path.
|
||||
#
|
||||
# dest - The String path to the destination dir.
|
||||
|
@ -96,7 +93,7 @@ module Jekyll
|
|||
{
|
||||
"path" => File.join("", relative_path),
|
||||
"modified_time" => mtime.to_s,
|
||||
"extname" => File.extname(relative_path)
|
||||
"extname" => extname
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue