Merge remote-tracking branch 'upstream/pull/4486'

[rails.git] / app / helpers / svg_helper.rb

diff --git a/app/helpers/svg_helper.rb b/app/helpers/svg_helper.rb
index 21b7c91adacfdd8bb46829806f76770759952e89..a40fa7086fdf0d1db0a752b99896f8e71f63e7b4 100644 (file)
--- a/app/helpers/svg_helper.rb
+++ b/app/helpers/svg_helper.rb
@@ -14,15 +14,17 @@ module SvgHelper
     svg_attrs = options.slice("width", "height", "opacity", :class)
 
     tag.svg(**svg_attrs) do
     svg_attrs = options.slice("width", "height", "opacity", :class)
 
     tag.svg(**svg_attrs) do

+      horizontal = "H#{options['width']}"

       concat tag.rect(**rect_attrs, **stroke_attrs(options, "border")) if options["fill"] || options["border"]
       concat tag.rect(**rect_attrs, **stroke_attrs(options, "border")) if options["fill"] || options["border"]

-      concat tag.line(:x2 => "100%", :y1 => "50%", :y2 => "50%", **stroke_attrs(options, "line")) if options["line"]
+      if options["line"]
+        y_middle = format("%g", 0.5 * options["height"])
+        concat tag.path(:d => "M0,#{y_middle} #{horizontal}", **stroke_attrs(options, "line"))
+      end

       if options["casing"]
         casing_width = options["casing-width"] || 1
       if options["casing"]
         casing_width = options["casing-width"] || 1

-        y_top = 0.5 * casing_width
-        y_bottom = options["height"] - (0.5 * casing_width)
-        concat tag.g(tag.line(:x2 => "100%", :y1 => y_top, :y2 => y_top) +
-                     tag.line(:x2 => "100%", :y1 => y_bottom, :y2 => y_bottom),
-                     **stroke_attrs(options, "casing"))
+        y_top = format("%g", 0.5 * casing_width)
+        y_bottom = format("%g", options["height"] - (0.5 * casing_width))
+        concat tag.path(:d => "M0,#{y_top} #{horizontal} M0,#{y_bottom} #{horizontal}", **stroke_attrs(options, "casing"))

       end
     end
   end
       end
     end
   end