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

vweb: allow quoting @css/@js resources with both ' and "

pull/5613/head
Delyan Angelov 2020-07-01 22:03:14 +03:00
parent 03ffe49aa3
commit 4e34edfa81
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ _ = footer
mut in_span := false mut in_span := false
//for _line in lines { //for _line in lines {
for i := 0; i < lines.len; i ++ { for i := 0; i < lines.len; i ++ {
line := lines[i].trim_space().replace("\'", '"') line := lines[i].trim_space()
if line == '<style>' { if line == '<style>' {
state = .css state = .css
} else if line == '</style>' { } else if line == '</style>' {
@ -98,16 +98,16 @@ _ = footer
pos := line.index('@js') or { pos := line.index('@js') or {
continue continue
} }
s.write('<script src=') // " is inserted in the template s.write('<script src="')
s.write(line[pos + 4..]) s.write(line[pos + 5..line.len-1])
s.writeln('></script>') s.writeln('"></script>')
} else if line.contains('@css ') { } else if line.contains('@css ') {
pos := line.index('@css') or { pos := line.index('@css') or {
continue continue
} }
s.write('<link href=') s.write('<link href="')
s.write(line[pos + 4..]) s.write(line[pos + 6..line.len-1])
s.writeln(' rel="stylesheet" type="text/css">') s.writeln('" rel="stylesheet" type="text/css">')
} else if line.contains('@if ') { } else if line.contains('@if ') {
s.writeln(str_end) s.writeln(str_end)
pos := line.index('@if') or { pos := line.index('@if') or {