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

Handle mixed units when checking the color stop order.

Browse Source
This commit is contained in:
Chris Eppstein 2010-05-02 15:41:33 -07:00
parent 3f9fc70a03
commit 00944fdfcc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,12 +57,19 @@ module Compass::SassExtensions::Functions::GradientSupport
assert_list(color_list) assert_list(color_list)
normalize_stops!(color_list) normalize_stops!(color_list)
max = color_list.values.last.stop max = color_list.values.last.stop
last_value = nil
color_stops = color_list.values.map do |pos| color_stops = color_list.values.map do |pos|
# have to convert absolute units to percentages for use in color stop functions. # have to convert absolute units to percentages for use in color stop functions.
stop = pos.stop stop = pos.stop
stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units
# Make sure the color stops are specified in the right order.
if last_value && last_value.value > stop.value
raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
end
last_value = stop
"color-stop(#{stop.inspect}, #{pos.color.inspect})" "color-stop(#{stop.inspect}, #{pos.color.inspect})"
end end
Sass::Script::String.new(color_stops.join(", ")) Sass::Script::String.new(color_stops.join(", "))
end end
@ -177,14 +184,6 @@ module Compass::SassExtensions::Functions::GradientSupport
end end
end end
end end
# Make sure the color stops are specified in the right order.
positions.inject do |last_pos, pos|
puts pos.inspect
if last_pos.stop.value > pos.stop.value
raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
end
pos
end
# normalize unitless numbers # normalize unitless numbers
positions.each do |pos| positions.each do |pos|
if pos.stop.unitless? && pos.stop.value <= 1 if pos.stop.unitless? && pos.stop.value <= 1
@ -193,6 +192,10 @@ module Compass::SassExtensions::Functions::GradientSupport
pos.stop = pos.stop.times(Sass::Script::Number.new(1, ["px"])) pos.stop = pos.stop.times(Sass::Script::Number.new(1, ["px"]))
end end
end end
if (positions.last.stop.eq(Sass::Script::Number.new(0, ["px"])).to_bool ||
positions.last.stop.eq(Sass::Script::Number.new(0, ["%"])).to_bool)
raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
end
nil nil
end end
def assert_list(value) def assert_list(value)