Commit 24845228 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Trying fixing table cell alignment

parent 3ac393c0

gitlabFilter/grid_table_filter.rb

+24 −24
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ module Banzai 
          # Anything, starting with | blocks which are ignored by this filter

          # +---+---+---+---+



          ^\s*\+(-+\+)+$\n         # First separator line

          (?:^\s*[|+][^\n]*$\n)*

          ^\s*\+(-+\+)+$           # Last separator line

          ^\+(:?-+:?\+)+$\n         # First separator line

          (?:^[|+][^\n]*$\n)*

          ^\+(-+\+)+$           # Last separator line



        )

      }mx
@@ -267,11 +267,11 @@ module Banzai 


          parts.each_with_index do |part, part_index|

            default_alignments << if part.start_with?(":") && !part.end_with?(":")

                                    'align="left"'

                                    'left'

                                  elsif !part.start_with?(":") && part.end_with?(":")

                                    'align="right"'

                                    'right'

                                  else

                                    'align="center"'

                                    'center'

                                  end



            start_pos = part_index == 0 ? 0 : header_delimiter_positions[part_index - 1]
@@ -289,11 +289,11 @@ module Banzai 


          parts.each_with_index do |part, part_index|

            default_alignments << if part.start_with?(":") && !part.end_with?(":")

                                      'align="left"'

                                    'left'

                                  elsif !part.start_with?(":") && part.end_with?(":")

                                      'align="right"'

                                    'right'

                                  else

                                      'align="center"'

                                    'center'

                                  end



            start_pos = part_index == 0 ? 0 : header_delimiter_positions[part_index - 1]
@@ -559,12 +559,12 @@ module Banzai 
                  cell.content = cell.content.gsub(

                    /(\s*([-*+]|\d+\.)\s+([^#{NEXT_ELEMENT_LIST_MARK}]+#{NEXT_ELEMENT_LIST_MARK}\n?))+/o, list)

                  # Enforce left alignment if cell contains a list

                  cell.alignment = 'align="left"'

                  cell.alignment = 'left'

                end



                rowspan = cell.rowspan > 1 ? %( rowspan="#{cell.rowspan}") : ""

                colspan = cell.colspan > 1 ? %( colspan="#{cell.colspan}") : ""

                html += %(<th#{rowspan}#{colspan} #{cell.alignment} markdown="1">\n\n#{cell.content}\n\n</th>)

                html += %(<th#{rowspan}#{colspan} markdown="1" style="text-align: #{cell.alignment}"><br /><br />#{cell.content}<br /><br /></th>)

              end

              html += '</tr>'

            end
@@ -588,12 +588,12 @@ module Banzai 
                cell.content = cell.content.gsub(

                  /(\s*([-*+]|\d+\.)\s+([^#{NEXT_ELEMENT_LIST_MARK}]+#{NEXT_ELEMENT_LIST_MARK}\n?))+/o, list)

                # Enforce left alignment if cell contains a list

                cell.alignment = 'align="left"'

                cell.alignment = 'left'

              end



              rowspan = cell.rowspan > 1 ? %( rowspan="#{cell.rowspan}") : ""

              colspan = cell.colspan > 1 ? %( colspan="#{cell.colspan}") : ""

              html += %(<td#{rowspan}#{colspan} #{cell.alignment} markdown="1">\n\n#{cell.content}\n\n</td>)

              html += %(<td#{rowspan}#{colspan} markdown="1" style="text-align: #{cell.alignment}">\n\n#{cell.content}\n\n</td>)

            end

            html += '</tr>'

          end