From: Aleksander Ɓukasz Date: Mon, 12 May 2014 08:26:25 +0000 (+0200) Subject: wlxml: lists - return some more information when extracting list items X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/76cceaee5424e76b3e260e53821e6f7fee6b31f2?ds=sidebyside;hp=-c wlxml: lists - return some more information when extracting list items --- 76cceaee5424e76b3e260e53821e6f7fee6b31f2 diff --git a/src/wlxml/extensions/list/list.js b/src/wlxml/extensions/list/list.js index 29834ae..3ee65d4 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 }); @@ -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(); diff --git a/src/wlxml/extensions/list/list.test.js b/src/wlxml/extensions/list/list.test.js index 396600b..2d47778 100644 --- a/src/wlxml/extensions/list/list.test.js +++ b/src/wlxml/extensions/list/list.test.js @@ -405,7 +405,7 @@ describe('Lists extension', function() { var test = doc.extractItems({item1: nestedListItem, item2: nestedListItem, merge: false}); - expect(test).to.equal(true, 'extraction status ok'); + expect(test.sameNode(nestedListItem)).to.equal(true, 'first item returned'); var sectionContents = section.contents(), extractedItem = sectionContents[1];