X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/d67ed5177c7b434beb026aab16a91333e295a914..4310156c7c3713b31e159c76d8ba2657a7421ead:/modules/documentCanvas/canvas/canvas.js diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 9bf47e8..c4bfc09 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -115,6 +115,11 @@ $.extend(Canvas.prototype, { wrapperElement.after({text: suffixOutside}); return wrapperElement; }, + getDocumentElement: function(from) { + if(from instanceof HTMLElement || from instanceof Text) { + return documentElement.wrap(from, this); + } + }, list: {} }); @@ -135,7 +140,8 @@ $.extend(Canvas.prototype.list, { var place = 'before'; var canvas = this; - parent.children().forEach(function(element) { + parent.children().some(function(element) { + var _e = element; if(element.sameNode(params.element1)) place = 'inside'; if(place === 'inside') { @@ -147,15 +153,15 @@ $.extend(Canvas.prototype.list, { element.setWlxmlClass('item'); elementsToWrap.push(element); } - if(element.sameNode(params.element2)) - return false; + if(_e.sameNode(params.element2)) + return true; }); var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')}); var toret; if(parent.is('list')) { - listElement.wrap({tag: 'div', klass: 'item'}); + listElement.wrapWithNodeElement({tag: 'div', klass: 'item'}); toret = listElement.parent(); } else { toret = listElement; @@ -167,6 +173,83 @@ $.extend(Canvas.prototype.list, { element.detach(); listElement.append(element); }); + }, + extractItems: function(params) { + params = _.extend({merge: true}, params); + var list = params.element1.parent(); + if(!list.is('list') || !(list.sameNode(params.element2.parent()))) + return false; + + var idx1 = list.childIndex(params.element1), + idx2 = list.childIndex(params.element2), + precedingItems = [], + extractedItems = [], + succeedingItems = [], + items = list.children(), + listIsNested = list.parent().getWlxmlClass() === 'item', + i; + + if(idx1 > idx2) { + var tmp = idx1; idx1 = idx2; idx2 = tmp; + } + + items.forEach(function(item, idx) { + if(idx < idx1) + precedingItems.push(item); + else if(idx >= idx1 && idx <= idx2) { + extractedItems.push(item); + } + else { + succeedingItems.push(item); + } + }); + + var reference = listIsNested ? list.parent() : list; + if(succeedingItems.length === 0) { + var reference_orig = reference; + extractedItems.forEach(function(item) { + reference.after(item); + reference = item; + if(!listIsNested) + item.setWlxmlClass(null); + }); + if(precedingItems.length === 0) + reference_orig.detach(); + } else if(precedingItems.length === 0) { + extractedItems.forEach(function(item) { + reference.before(item); + if(!listIsNested) + item.setWlxmlClass(null); + }); + } else { + extractedItems.forEach(function(item) { + reference.after(item); + if(!listIsNested) + item.setWlxmlClass(null); + reference = item; + }); + var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this), + toAdd = secondList; + + if(listIsNested) { + toAdd = secondList.wrapWithNodeElement({tag: 'div', klass:'item'}); + } + succeedingItems.forEach(function(item) { + secondList.append(item); + }); + + reference.after(toAdd); + } + if(!params.merge && listIsNested) { + return this.extractItems({element1: extractedItems[0], element2: extractedItems[extractedItems.length-1]}); + } + return true; + }, + areItemsOfTheSameList: function(params) { + var e1 = params.element1, + e2 = params.element2; + return e1.parent().sameNode(e2.parent()) + && e1.parent().is('list'); } });