lib/esvg/symbol.rb in esvg-4.3.2 vs lib/esvg/symbol.rb in esvg-4.3.3

- old
+ new

@@ -75,15 +75,11 @@ end if title = options.delete(:title) content = "<title>#{title}</title>#{content}" end - use_attr = { - height: options[:height], - width: options[:width], - scale: options[:scale], - }.merge(options.delete(:use) || {}) + use_attr = options.delete(:use) || {} svg_attr = { class: [@config[:class], @config[:prefix]+"-"+@name, options.delete(:class)].compact.join(' '), viewBox: @size[:viewBox], role: 'img' @@ -102,10 +98,10 @@ def use_tag(options={}) options["xlink:href"] = "##{@id}" # If user doesn't pass a size or set scale: true - if options[:width].nil? && options[:height].nil? && options[:scale].nil? + if options[:width].nil? && options[:height].nil? && !options[:scale] && !@config[:scale] options[:width] ||= width options[:height] ||= height end options.delete(:scale)