wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 06:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip \r from form input- we normalize everything to Unix

Browse source 
Change-Id: I5cd255e1a7ab9958f120fad408362e6f709e4b91
This commit is contained in:
Gabriel Wicke 2012-06-06 19:26:29 +02:00
parent 47204c4ca0
commit 413df0c471
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
api/ParserService.js
View file

@ -85,7 +85,7 @@ app.post(/\/_html\/(.*)/, function(req, res){
env.pageName = req.params[0];
res.setHeader('Content-Type', 'text/html; charset=UTF-8');
var p = new html5.Parser();
p.parse( '<html><body>' + req.body.content + '</body></html>' );
p.parse( '<html><body>' + req.body.content.replace(/\r/g, '') + '</body></html>' );
res.write('<pre style="background-color: #efefef">');
new WikitextSerializer({env: env}).serializeDOM(
p.tree.document.childNodes[0].childNodes[1],
@ -94,7 +94,7 @@ app.post(/\/_html\/(.*)/, function(req, res){
});
res.write('</pre>');
res.write( "<hr>Your HTML DOM:" );
textarea( res, req.body.content );
textarea( res, req.body.content.replace(/\r/g, '') );
res.end('');
});
@ -117,14 +117,14 @@ app.post(/\/_wikitext\/(.*)/, function(req, res){
//res.write('<form method=POST><input name="content"></form>');
//res.end("hello world\n" + req.method + ' ' + req.params.title);
res.write( "<hr>Your wikitext:" );
textarea( res, req.body.content );
textarea( res, req.body.content.replace(/\r/g, '') );
res.end('');
});
try {
res.setHeader('Content-Type', 'text/html; charset=UTF-8');
console.log('starting parsing of ' + req.params[0]);
// FIXME: This does not handle includes or templates correctly
parser.process( req.body.content );
parser.process( req.body.content.replace(/\r/g, '') );
} catch (e) {
console.log( e );
res.write( e );
@ -291,7 +291,8 @@ app.post(/\/_rtform\/(.*)/, function(req, res){
res.setHeader('Content-Type', 'text/html; charset=UTF-8');
var parser = parserPipelineFactory.makePipeline( 'text/x-mediawiki/full' );
parse( res, roundTripDiff, req.body.content);
// we don't care about \r, and normalize everything to \n
parse( res, roundTripDiff, req.body.content.replace(/\r/g, ''));
});
/**