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

Pre and link target improvements

Browse source 
* Don't explicitly add the newline in the pre, as we preserve newline tokens
  now. This avoids doubling of newlines when round-tripping.
* Use the sHref attribute even if the href contains spaces.

Change-Id: I8bec8fbfd6a7836bf2e5eec20869a0edd95c93b6
This commit is contained in:
Gabriel Wicke 2012-06-04 14:03:05 +02:00
parent ee2ddbd3cb
commit 92f753a365
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/parser/mediawiki.WikitextSerializer.js
View file

@ -122,9 +122,7 @@ WSP._linkHandler = function( state, token ) {
var attribDict = state.env.KVtoHash( token.attribs );
if ( attribDict.rel && attribDict.href !== undefined ) {
var target = decodeURIComponent(
attribDict.href.substr( state.env.wgScriptPath.length + 1 )
.replace( /_/g, ' ' )
);
attribDict.href.substr( state.env.wgScriptPath.length + 1 ) );
if ( token.dataAttribs.sHref ) {
//console.warn( JSON.stringify( token.dataAttribs.sHref ) );
var normalizedOrigHref = state.env.resolveTitle(
@ -134,6 +132,8 @@ WSP._linkHandler = function( state, token ) {
if ( normalizedOrigHref === target ) {
target = token.dataAttribs.sHref;
}
} else {
target = target.replace( /_/g, ' ' )
}
if ( attribDict.rel === 'mw:wikiLink' ) {
@ -268,7 +268,7 @@ WSP.tagToWikitext = {
// XXX: support indent variant instead by registering a newline handler?
pre: {
start: function( state, token ) {
state.textHandler = function( t ) { return t.replace( '\n', '\n ' ); };
state.textHandler = function( t ) { return t.replace( /\n/g, '\n ' ); };
return '';
},
end: function( state, token) { state.textHandler = null; return ''; }

2
modules/parser/pegTokenizer.pegjs.txt
View file

@ -1107,7 +1107,7 @@ pre_indent_in_tags
/ & { return stops.dec('pre'); }
pre_indent_line = space l:inlineline {
return [ '\n' ].concat(l);
return l;
}
/*