fixed bug where application integrations would not load if there was a config file
This commit is contained in:
parent
e4681e2672
commit
11cf736066
@ -3,7 +3,7 @@ require "compass/app_integration/stand_alone"
|
||||
module Compass
|
||||
module AppIntegration
|
||||
module Helpers
|
||||
attr_accessor :project_types
|
||||
#attr_accessor :project_types
|
||||
DEAFULT_PROJECT_TYPES = {
|
||||
:stand_alone => "Compass::AppIntegration::StandAlone"
|
||||
}
|
||||
@ -12,6 +12,14 @@ module Compass
|
||||
@project_types ||= DEAFULT_PROJECT_TYPES
|
||||
end
|
||||
|
||||
def project_types
|
||||
@project_types
|
||||
end
|
||||
|
||||
def any?
|
||||
@project_types == DEAFULT_PROJECT_TYPES
|
||||
end
|
||||
|
||||
def lookup(type)
|
||||
unless @project_types[type].nil?
|
||||
eval @project_types[type]
|
||||
|
@ -92,7 +92,7 @@ module Compass
|
||||
def add_project_configuration(*args)
|
||||
options = args.last.is_a?(Hash) ? args.pop : {}
|
||||
configuration_file_path = args.shift || detect_configuration_file
|
||||
|
||||
|
||||
raise ArgumentError, "Too many arguments" if args.any?
|
||||
if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
|
||||
if data.raw_project_type
|
||||
@ -103,9 +103,11 @@ module Compass
|
||||
add_configuration(:stand_alone)
|
||||
end
|
||||
|
||||
add_configuration(data)
|
||||
unless AppIntegration.any?
|
||||
add_configuration(data)
|
||||
end
|
||||
else
|
||||
add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
|
||||
add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user