Showing
2 changed files
with
4 additions
and
4 deletions
| @@ -27,11 +27,11 @@ module Kanjai | @@ -27,11 +27,11 @@ module Kanjai | ||
| 27 | result = [] | 27 | result = [] |
| 28 | @html_source.scan(/<!--###START element[\w\W]+?-->/).each do |item| | 28 | @html_source.scan(/<!--###START element[\w\W]+?-->/).each do |item| |
| 29 | 29 | ||
| 30 | - name, type, code = item.scan(/<!--###START\s+element\(name="([^"]+)",\s+type="([\w\s]+)"\)\s+###/)[0] | 30 | + name, type, code = item.scan(/<!--###START\s+element\(name="([^"]+)",\s+type="([\w\s]+)",\s+id="(.+)"\)\s+###/)[0] |
| 31 | 31 | ||
| 32 | if name.present? and type.present? | 32 | if name.present? and type.present? |
| 33 | 33 | ||
| 34 | - source = item.gsub(/<!--###START\s+element\(name="([^"]+)",\s+type="([\w\s]+)"\)\s+###/, '') | 34 | + source = item.gsub(/<!--###START\s+element\(name="([^"]+)",\s+type="([\w\s]+)",\s+id="(.+)"\)\s+###/, '') |
| 35 | source = source.gsub('-->', '') | 35 | source = source.gsub('-->', '') |
| 36 | source = source.gsub("\n", '') | 36 | source = source.gsub("\n", '') |
| 37 | source = source.gsub("\r", '') | 37 | source = source.gsub("\r", '') |
| @@ -52,7 +52,7 @@ module Kanjai | @@ -52,7 +52,7 @@ module Kanjai | ||
| 52 | result << { | 52 | result << { |
| 53 | name: name, | 53 | name: name, |
| 54 | type: type, | 54 | type: type, |
| 55 | - code: name.parameterize, | 55 | + code: code, |
| 56 | source: source, | 56 | source: source, |
| 57 | elements: elements, | 57 | elements: elements, |
| 58 | field_options: @field_options | 58 | field_options: @field_options |