X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/2687ec6cbbe8101a4faa232c79f5c1321dcebe6d..6473eb47e2b1b17a3935cbfae451199123607bc9:/src/wlxml/extensions/list/list.js?ds=sidebyside diff --git a/src/wlxml/extensions/list/list.js b/src/wlxml/extensions/list/list.js index 29834ae..8d88115 100644 --- a/src/wlxml/extensions/list/list.js +++ b/src/wlxml/extensions/list/list.js @@ -36,7 +36,7 @@ extension.wlxmlClass.list.transformations = { last; if(contents.length) { last = contents[contents.length-1]; - this.document.extractItems({ + return this.document.extractItems({ item1: first, item2: last }); @@ -111,7 +111,7 @@ extension.document.transformations.extractItems = { extractedItems = [], succeedingItems = [], items = list.contents(), - listIsNested = list.parent().is('item'); + listIsNested = list.parent().is('item') && !list.parent().isContextRoot(); items.forEach(function(item, idx) { @@ -133,7 +133,7 @@ extension.document.transformations.extractItems = { reference.after(item); reference = item; if(!listIsNested) { - item.setClass(''); + item.setClass('p'); } }); if(precedingItems.length === 0) { @@ -143,14 +143,14 @@ extension.document.transformations.extractItems = { extractedItems.forEach(function(item) { reference.before(item); if(!listIsNested) { - item.setClass(''); + item.setClass('p'); } }); } else { extractedItems.forEach(function(item) { reference.after(item); if(!listIsNested) { - item.setClass(''); + item.setClass('p'); } reference = item; }); @@ -169,7 +169,7 @@ extension.document.transformations.extractItems = { if(!params.merge && listIsNested) { return this.extractItems({item1: extractedItems[0], item2: extractedItems[extractedItems.length-1]}); } - return true; + return extractedItems[0]; }, isAllowed: function() { var parent = this.args[0].nodel1.parent();