vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

vweb: fix a bug with <span>

pull/5311/head
Alexander Medvednikov 2020-06-10 01:43:04 +02:00
parent e5aba94ae4
commit 4a7ec90bef
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/vweb/tmpl/tmpl.v
View File

@ -23,7 +23,7 @@ enum State {
html html
css // <style> css // <style>
js // <script> js // <script>
span // span.{ //span // span.{
} }
pub fn compile_template(content, fn_name string) string { pub fn compile_template(content, fn_name string) string {
@ -51,6 +51,7 @@ pub fn compile_template(content, fn_name string) string {
") ")
s.writeln(str_start) s.writeln(str_start)
mut state := State.html mut state := State.html
mut in_span := false
for _line in lines { for _line in lines {
line := _line.trim_space() line := _line.trim_space()
if line == '<style>' { if line == '<style>' {
@ -90,7 +91,7 @@ pub fn compile_template(content, fn_name string) string {
// `span.header {` => `<span class='header'>` // `span.header {` => `<span class='header'>`
class := line.find_between('span.', '{').trim_space() class := line.find_between('span.', '{').trim_space()
s.writeln('<span class="$class">') s.writeln('<span class="$class">')
state = .span in_span = true
} else if state == .html && line.contains('.') && line.ends_with('{') { } else if state == .html && line.contains('.') && line.ends_with('{') {
// `.header {` => `<div class='header'>` // `.header {` => `<div class='header'>`
class := line.find_between('.', '{').trim_space() class := line.find_between('.', '{').trim_space()
@ -100,9 +101,9 @@ pub fn compile_template(content, fn_name string) string {
class := line.find_between('#', '{').trim_space() class := line.find_between('#', '{').trim_space()
s.writeln('<div id="$class">') s.writeln('<div id="$class">')
} else if state == .html && line == '}' { } else if state == .html && line == '}' {
if state == .span { if in_span {
s.writeln('</span>') s.writeln('</span>')
state = .html in_span = false
} else { } else {
s.writeln('</div>') s.writeln('</div>')
} }