github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed weird bug with data inheritance

Browse Source
This commit is contained in:
Scott Davis 2012-01-30 19:59:31 -05:00
parent f70afea8db
commit e4681e2672
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/compass/configuration/inheritance.rb
View File

@ -129,7 +129,11 @@ module Compass
if #{attr}_set? # if sprite_load_paths_set? if #{attr}_set? # if sprite_load_paths_set?
@#{attr} # Array(@#{attr}) @#{attr} # Array(@#{attr})
else # else else # else
value = Array(read(#{attr.inspect})) # value = Array(read(:sprite_load_paths)) value = if inherited_data # value = Array(read(:sprite_load_paths))
Array(inherited_data.#{attr})
else
Array(read(#{attr.inspect}))
end
value -= Array(@removed_from_#{attr}) # value -= Array(@removed_from_sprite_load_paths) value -= Array(@removed_from_#{attr}) # value -= Array(@removed_from_sprite_load_paths)
Array(@added_to_#{attr}) + value # Array(@added_to_sprite_load_paths) + value Array(@added_to_#{attr}) + value # Array(@added_to_sprite_load_paths) + value
end # end end # end