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

Fix for Bug 37913

Browse source 
* Strips the first paragraph tag in a list item or table cell context
  if there are no attributes on it and stx:html is not set

Change-Id: I74988645fe505c662f86488e32d0f11d464ffe41
This commit is contained in:
Subramanya Sastry 2012-06-29 23:47:59 -05:00
parent 604aae2f3f
commit 166e7a75c9
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,13 +228,14 @@ var id = function(v) {
}; };
}; };
WSP._listHandler = function( handler, bullet, state, token ) { function isListItem(token) {
function isListItem(token) {
if (token.constructor !== TagTk) return false; if (token.constructor !== TagTk) return false;
var tokenName = token.name; var tokenName = token.name;
return (tokenName === 'li' || tokenName === 'dt' || tokenName === 'dd'); return (tokenName === 'li' || tokenName === 'dt' || tokenName === 'dd');
} }
WSP._listHandler = function( handler, bullet, state, token ) {
if ( state.singleLineMode ) { if ( state.singleLineMode ) {
state.singleLineMode--; state.singleLineMode--;
} }
@ -636,9 +637,22 @@ WSP.tagHandlers = {
}, },
p: { p: {
make: function(state, token) { make: function(state, token) {
// "stx": "html" tags never get here
// Special case handling in a list context // Special case handling in a list context
// VE embeds list content in paragraph tags // VE embeds list content in paragraph tags.
//
// SSS FIXME: This will *NOT* work if the list item has nested paragraph tags!
var prevToken = state.prevToken;
if ( token.attribs.length === 0
&& ( (state.listStack.length > 0 && isListItem(prevToken))
|| (prevToken.constructor === TagTk && prevToken.name === 'td')
|| (state.ignorePTag && token.constructor === EndTagTk)))
{
state.ignorePTag = !state.ignorePTag;
return { start: { ignore: true }, end: { ignore: true } };
} else {
return state.singleLineMode ? WSP.defaultHTMLTagHandler : this; return state.singleLineMode ? WSP.defaultHTMLTagHandler : this;
}
}, },
start: { start: {
startsNewline : true, startsNewline : true,