Fixing canvas.createList

Selecting text for list items from bottom to top wasn't supported

diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js
index a6becf4..0d4ad75 100644 (file)
--- a/modules/documentCanvas/canvas.js
+++ b/modules/documentCanvas/canvas.js
@@ -131,6 +131,14 @@ Canvas.prototype.createList = function(options) {
         return false;\r
         \r
     var parent = element1.parent();\r
         return false;\r
         \r
     var parent = element1.parent();\r

+    \r
+    if(parent.contents().index(element1) > parent.contents().index(element2)) {\r
+        var tmp = element1;\r
+        element1 = element2;\r
+        element2 = tmp;\r
+    }\r
+        \r
+    \r

     var nodesToWrap = [];\r
     \r
     var place = 'before';\r
     var nodesToWrap = [];\r
     \r
     var place = 'before';\r

diff --git a/modules/documentCanvas/tests/canvas.test.js b/modules/documentCanvas/tests/canvas.test.js
index 35f0d85..53bd35d 100644 (file)
--- a/modules/documentCanvas/tests/canvas.test.js
+++ b/modules/documentCanvas/tests/canvas.test.js
@@ -137,6 +137,25 @@ define([
 \r
         });\r
         \r
 \r
         });\r
         \r

+        test('create list from existing nodes reverse', function() {\r
+            var c = new canvas.Canvas('<section><div>Alice</div>has<div>a cat</div><div>some text</div></section>');\r
+            var div1 = c.getNode({tag:'div'})[0];\r
+            var div2 = c.getNode({tag:'div'})[1];\r
+            \r
+            c.createList({start: div2, end: div1});\r
+            \r
+            assert.xmlEqual(c.toXML(), '\\r
+                <section>\\r
+                    <div class="list.items">\\r
+                        <div class="item">Alice</div>\\r
+                        <div class="item">has</div>\\r
+                        <div class="item">a cat</div>\\r
+                    </div>\\r
+                    <div>some text</div>\\r
+                </section>');\r
+\r
+        });\r
+        \r

         test('remove list', function() {\r
             var xml = '\\r
                 <section>\\r
         test('remove list', function() {\r
             var xml = '\\r
                 <section>\\r