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

Fix some edge case uses of color stops with list arguments.

Browse Source
This commit is contained in:
Chris Eppstein 2011-04-02 11:59:54 -07:00
parent af10edd7a9
commit 727c025881
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/compass/sass_extensions/functions/gradient_support.rb
View File

@ -237,8 +237,8 @@ module Compass::SassExtensions::Functions::GradientSupport
position_and_angle = nil if position_and_angle && !position_and_angle.to_bool position_and_angle = nil if position_and_angle && !position_and_angle.to_bool
# Support legacy use of the color-stops() function # Support legacy use of the color-stops() function
if color_stops.size == 1 && list_of_color_stops?(color_stops.first) if color_stops.size == 1 && (stops = list_of_color_stops?(color_stops.first))
color_stops = color_stops.first.value color_stops = stops
end end
LinearGradient.new(position_and_angle, send(:color_stops, *color_stops)) LinearGradient.new(position_and_angle, send(:color_stops, *color_stops))
end end
@ -261,8 +261,8 @@ module Compass::SassExtensions::Functions::GradientSupport
stop = pos.stop stop = pos.stop
stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units && max.numerator_units != ["%"] stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units && max.numerator_units != ["%"]
# Make sure the color stops are specified in the right order. # Make sure the color stops are specified in the right order.
if last_value && last_value.value > stop.value if last_value && stop.numerator_units == last_value.numerator_units && stop.denominator_units == last_value.denominator_units && stop.value < last_value.value
raise Sass::SyntaxError.new("Color stops must be specified in increasing order") raise Sass::SyntaxError.new("Color stops must be specified in increasing order. #{stop.value} came after #{last_value.value}.")
end end
last_value = stop last_value = stop
[stop, pos.color] [stop, pos.color]
@ -392,7 +392,11 @@ module Compass::SassExtensions::Functions::GradientSupport
end end
def list_of_color_stops?(arg) def list_of_color_stops?(arg)
arg.value.is_a?(Array) && arg.value.all?{|a| a.is_a?(ColorStop)} if arg.respond_to?(:value)
arg.value.is_a?(Array) && arg.value.all?{|a| color_stop?(a)} ? arg.value : nil
elsif arg.is_a?(Array)
arg.all?{|a| color_stop?(a)} ? arg : nil
end
end end
def linear_svg(color_stops, x1, y1, x2, y2) def linear_svg(color_stops, x1, y1, x2, y2)