editor: canvas - do not break an empty paragraph on ENTER

[fnpeditor.git] / src / wlxml / extensions / list / list.js

diff --git a/src/wlxml/extensions/list/list.js b/src/wlxml/extensions/list/list.js
index d17e3e3..7731616 100644 (file)
--- 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];
+            return 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,7 +59,8 @@ 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;
         
@@ -69,6 +92,7 @@ extension.document.transformations.createList = {
         nodesToWrap.forEach(function(node) {
             listNode.append(node);
         });
+        return listNode;
     },
     getChangeRoot: function() {
         return this.args[0].node1.parent();
@@ -87,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) {
@@ -130,7 +154,7 @@ extension.document.transformations.extractItems = {
                 }
                 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) {
@@ -145,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();