X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/dc8e2e1f8da0f76030d4a4d3c2acf432c9896779..45c6e40d4312a3bc53fb0c64574d9e5b1f298193:/src/wlxml/extensions/list/list.js?ds=inline diff --git a/src/wlxml/extensions/list/list.js b/src/wlxml/extensions/list/list.js index 99cacb1..29834ae 100644 --- a/src/wlxml/extensions/list/list.js +++ b/src/wlxml/extensions/list/list.js @@ -22,14 +22,36 @@ extension.wlxmlClass.list.methods = { } }; +extension.wlxmlClass.list.transformations = { + extractAllItems: function() { + var contents = this.contents(); + return this.document.extractItems({item1: contents[0], item2: _.last(contents)}); + } +}; + +extension.wlxmlClass.list.transformations = { + extractListItems: function() { + var contents = this.contents(), + first = contents[0], + last; + if(contents.length) { + last = contents[contents.length-1]; + this.document.extractItems({ + item1: first, + item2: last + }); + } else { + this.detach(); + } + } +}; + extension.document.methods = { areItemsOfSameList: function(params) { return params.node1.parent().sameNode(params.node2.parent()) && params.node2.parent().is('list'); } }; - - extension.document.transformations.createList = { impl: function(params) { /* globals Node */ @@ -37,13 +59,18 @@ extension.document.transformations.createList = { parentContents = parent.contents(), nodeIndexes = [params.node1.getIndex(), params.node2.getIndex()].sort(function(a,b) { return a-b; }), nodesToWrap = [], - listNode = params.node1.document.createDocumentNode({tagName: 'div', attrs: {'class': 'list'}}), + listClass = params.klass || 'list', + listNode = params.node1.document.createDocumentNode({tagName: 'div', attrs: {'class': listClass}}), + listPlacePtr = params.node1, node, i; - + for(i = nodeIndexes[0]; i <= nodeIndexes[1]; i++) { node = parentContents[i]; if(node.nodeType === Node.TEXT_NODE) { node = node.wrapWith({tagName: 'div', attrs: {'class': 'item'}}); + if(i === nodeIndexes[0]) { + listPlacePtr = node; + } } else { node.setClass('item'); } @@ -60,11 +87,12 @@ extension.document.transformations.createList = { toInsert = listNode; } - params.node1.before(toInsert); + listPlacePtr.before(toInsert); nodesToWrap.forEach(function(node) { listNode.append(node); }); + return listNode; }, getChangeRoot: function() { return this.args[0].node1.parent(); @@ -105,7 +133,7 @@ extension.document.transformations.extractItems = { reference.after(item); reference = item; if(!listIsNested) { - item.setClass(null); + item.setClass(''); } }); if(precedingItems.length === 0) { @@ -115,18 +143,18 @@ extension.document.transformations.extractItems = { extractedItems.forEach(function(item) { reference.before(item); if(!listIsNested) { - item.setClass(null); + item.setClass(''); } }); } else { extractedItems.forEach(function(item) { reference.after(item); if(!listIsNested) { - item.setClass(null); + item.setClass(''); } reference = item; }); - var secondList = params.item1.document.createDocumentNode({tagName: 'div', attrs: {'class':'list'}}), + var secondList = params.item1.document.createDocumentNode({tagName: 'div', attrs: {'class': list.getClass() || 'list'}}), toAdd = secondList; if(listIsNested) {