:dependencies => :globals in :require_js configuration

This commit is contained in:
Parker Moore 2013-04-05 18:28:25 +02:00
parent 84aa44b77d
commit ee6f68526d

View File

@ -15,15 +15,15 @@ module Octopress
unless Octopress.configuration.has_key? :require_js
abort "No :require_js key in configuration. Cannot proceed.".red
end
unless Octopress.configuration[:require_js].has_key? :dependencies
abort "No :dependencies key in :require_js configuration. Cannot proceed.".red
unless Octopress.configuration[:require_js].has_key? :globals
abort "No :globals key in :require_js configuration. Cannot proceed.".red
end
unless Octopress.configuration[:require_js].has_key? :modules
abort "No :modules key in :require_js configuration. Cannot proceed.".red
end
# Read js dependencies from require_js.yml configuration
@globals = Octopress.configuration[:require_js][:dependencies].collect {|item| Dir.glob("#{@js_assets_path}/#{item}") }.flatten.uniq
@globals = Octopress.configuration[:require_js][:globals].collect {|item| Dir.glob("#{@js_assets_path}/#{item}") }.flatten.uniq
@modules = Octopress.configuration[:require_js][:modules].collect {|item| Dir.glob("#{@js_assets_path}/#{item}") }.flatten.uniq
@template_path = File.expand_path("../../#{Octopress.configuration[:source]}", File.dirname(__FILE__))