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

made things less ambiguous

Browse Source
This commit is contained in:
Scott Davis 2011-05-11 02:45:26 -04:00
parent fdd639efaf
commit 2f105f3696
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ module Compass::SassExtensions::Functions::Sprites
# #
# background: url('/images/icons.png?12345678') 0 -24px no-repeat; # background: url('/images/icons.png?12345678') 0 -24px no-repeat;
def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO) def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO)
sprite = convert_sprite(sprite) sprite = convert_sprite_name(sprite)
verify_map(map) verify_map(map)
unless sprite.is_a?(Sass::Script::String) unless sprite.is_a?(Sass::Script::String)
raise Sass::SyntaxError, %Q(The second argument to sprite() must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.) raise Sass::SyntaxError, %Q(The second argument to sprite() must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
@ -57,7 +57,7 @@ module Compass::SassExtensions::Functions::Sprites
# Returns the path to the original image file for the sprite with the given name # Returns the path to the original image file for the sprite with the given name
def sprite_file(map, sprite) def sprite_file(map, sprite)
sprite = convert_sprite(sprite) sprite = convert_sprite_name(sprite)
verify_map(map, "sprite") verify_map(map, "sprite")
verify_sprite(sprite) verify_sprite(sprite)
if image = map.image_for(sprite.value) if image = map.image_for(sprite.value)
@ -70,7 +70,7 @@ module Compass::SassExtensions::Functions::Sprites
# Returns voolean if sprite has a parent # Returns voolean if sprite has a parent
def sprite_does_not_have_parent(map, sprite) def sprite_does_not_have_parent(map, sprite)
sprite = convert_sprite(sprite) sprite = convert_sprite_name(sprite)
verify_map map verify_map map
verify_sprite sprite verify_sprite sprite
Sass::Script::Bool.new map.image_for(sprite.value).parent.nil? Sass::Script::Bool.new map.image_for(sprite.value).parent.nil?
@ -80,7 +80,7 @@ module Compass::SassExtensions::Functions::Sprites
# Returns boolean if sprite has the selector # Returns boolean if sprite has the selector
def sprite_has_selector(map, sprite, selector) def sprite_has_selector(map, sprite, selector)
sprite = convert_sprite(sprite) sprite = convert_sprite_name(sprite)
verify_map map verify_map map
verify_sprite sprite verify_sprite sprite
unless VALID_SELECTORS.include?(selector.value) unless VALID_SELECTORS.include?(selector.value)
@ -122,7 +122,7 @@ module Compass::SassExtensions::Functions::Sprites
# #
# background-position: 3px -36px; # background-position: 3px -36px;
def sprite_position(map, sprite = nil, offset_x = ZERO, offset_y = ZERO) def sprite_position(map, sprite = nil, offset_x = ZERO, offset_y = ZERO)
sprite = convert_sprite(sprite) sprite = convert_sprite_name(sprite)
verify_map(map, "sprite-position") verify_map(map, "sprite-position")
unless sprite && sprite.is_a?(Sass::Script::String) unless sprite && sprite.is_a?(Sass::Script::String)
raise Sass::SyntaxError, %Q(The second argument to sprite-position must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.) raise Sass::SyntaxError, %Q(The second argument to sprite-position must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
@ -152,9 +152,9 @@ module Compass::SassExtensions::Functions::Sprites
protected protected
def convert_sprite(sprite) def convert_sprite_name(sprite)
if sprite.is_a?(Sass::Script::Color) if sprite.is_a?(Sass::Script::Color)
return Sass::Script::String.new(sprite.to_s) return Sass::Script::String.new(Sass::Script::Color::HTML4_COLORS_REVERSE[sprite.rgb])
end end
sprite sprite
end end