wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow newlines in various attributes

Browse source
This commit is contained in:
Gabriel Wicke 2011-11-30 15:12:53 +00:00
parent 821162484e
commit 82e31ffd42
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/parser/pegParser.pegjs.txt
View file

@ -647,10 +647,11 @@ extlink
// = "[" target:url text:extlink_text "]" { return { type: 'extlink', target: target, text: text } }
url
= proto:"http:" rest:([^ \]]+) { return proto + rest.join(''); }
= proto:"http:" rest:([^ \]\n]+) { return proto + rest.join(''); }
// XXX: convert to syntax flags and generic inline!
extlink_text
= c:(inline_element / ch:[^\]] { return {type: 'TEXT', value: ch}; })+
= c:(inline_element / ch:[^\]\n] { return {type: 'TEXT', value: ch}; })+
template
= "{{" target:template_target params:("|" p:template_param { return p })* "}}" {
@ -665,7 +666,7 @@ template
}
template_target
= h:( !"}}" x:([^|]) { return x } )* { return h.join(''); }
= h:( !"}}" x:([^|\n]) { return x } )* { return h.join(''); }
template_param
= name:template_param_name "=" c:template_param_text {
@ -688,7 +689,7 @@ tplarg
}
template_param_name
= h:( !"}}" x:([^=|]) { return x } )* { return h.join(''); }
= h:( !"}}" x:([^=|\n]) { return x } )* { return h.join(''); }
template_param_text
= template_param_text_chunk*
@ -701,7 +702,7 @@ template_param_text_chunk
/ template
/ link
/ quote
/ !"}}" x:([^|]) { return x }
/ !"}}" x:([^|\n]) { return x }
link
= "[[" target:link_target text:("|" link_text)* "]]" {
@ -720,7 +721,7 @@ link
}
link_target
= h:( !"]]" x:([^|]) { return x } )* { return h.join(''); }
= h:( !"]]" x:([^|\n]) { return x } )* { return h.join(''); }
link_text
= h:( & { return setFlag('linkdesc'); }
@ -856,7 +857,7 @@ generic_attribute_value
= "=" space* v:att_value {return v}
att_value
= t:[^ \t'"<>=']+ { return [null, t.join('')]; }
= t:[^ \t'"<>='\n]+ { return [null, t.join('')]; }
/ "'" t:[^'>]+ "'" { return unquote("'", t.join('')); }
/ '"' t:[^">]+ '"' { return unquote('"', t.join('')); }