Fixing canvas.createList

[fnpeditor.git] / modules / documentCanvas / canvas.js

diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js
index 20c286a..0d4ad75 100644 (file)
--- a/modules/documentCanvas/canvas.js
+++ b/modules/documentCanvas/canvas.js
@@ -15,8 +15,8 @@ var Canvas = function(xml) {
 }\r
 \r
 Canvas.prototype.setXML = function(xml) {\r
-    this.xml = xml;\r
-    this.content.html(transformations.fromXML.getHTMLTree(xml));  \r
+    this.xml = $.trim(xml);\r
+    this.content.html(transformations.fromXML.getHTMLTree(this.xml));  \r
 }\r
 \r
 Canvas.prototype.toXML = function() {\r
@@ -36,6 +36,14 @@ Canvas.prototype.getNode = function(desc) {
     return toret;\r
 }\r
 \r
+Canvas.prototype.getPreviousNode = function(options) {\r
+    var element = $(this.content.find('#' + options.node.id).get(0));\r
+    var prev = element.prev()\r
+    if(prev.length === 0)\r
+        prev = element.parent();\r
+    return new wlxmlNode.Node(prev);\r
+}\r
+\r
 Canvas.prototype._createNode = function(wlxmlTag, wlxmlClass) {\r
             var toBlock = ['div', 'document', 'section', 'header'];\r
             var htmlTag = _.contains(toBlock, wlxmlTag) ? 'div' : 'span';\r
@@ -49,8 +57,11 @@ Canvas.prototype._createNode = function(wlxmlTag, wlxmlClass) {
 \r
 Canvas.prototype.insertNode = function(options) {\r
     var element = $(this.content.find('#' + options.context.id).get(0));\r
-    if(options.place == 'after')\r
-        element[options.place](this._createNode(options.tag, options.klass));\r
+    if(options.place == 'after') {\r
+        var node = this._createNode(options.tag, options.klass);\r
+        element[options.place](node);\r
+        return node;\r
+    }\r
     else if(options.place == 'wrapText') {\r
         var elementContents = element.contents();\r
         if(elementContents.length !== 1 || elementContents.get(0).nodeType != 3)\r
@@ -65,6 +76,7 @@ Canvas.prototype.insertNode = function(options) {
         $(textElement).replaceWith(newNode);\r
         newNode.before(prefix);\r
         newNode.after(suffix);\r
+        return newNode;\r
     }\r
 }\r
 \r
@@ -106,6 +118,12 @@ Canvas.prototype.splitNode = function(options) {
     return newNode;\r
 }\r
 \r
+Canvas.prototype.removeNode = function(options) {\r
+    var toRemove = $(this.content.find('#' + options.node.id).get(0));\r
+    toRemove.remove();\r
+\r
+}\r
+\r
 Canvas.prototype.createList = function(options) {\r
     var element1 = $(this.content.find('#' + options.start.id).get(0));\r
     var element2 = $(this.content.find('#' + options.end.id).get(0));\r
@@ -113,6 +131,14 @@ Canvas.prototype.createList = function(options) {
         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
@@ -130,23 +156,42 @@ Canvas.prototype.createList = function(options) {
             else {\r
                 $node = $(node);\r
             }\r
-            $node.attr('wlxml-class', 'list.item');\r
+            $node.attr('wlxml-class', 'item');\r
             nodesToWrap.push($node);\r
         }\r
         if(node.isSameNode(element2.get(0)))\r
-            return;\r
+            return false;\r
     });\r
     \r
-    var list = this._createNode('div', 'list');\r
+    var list = this._createNode('div', 'list-items');\r
     element1.before(list);\r
     \r
     nodesToWrap.forEach(function(node) {\r
         node.remove();\r
         list.append(node);\r
     });\r
+}\r
+\r
+Canvas.prototype.removeList = function(options) {\r
+    var pointerElement = $(this.content.find('#' + options.pointer.id));\r
+    var listElement = options.pointer.klass === 'list-items' ? pointerElement : \r
+        pointerElement.parent('[wlxml-class="list-items"][wlxml-tag]');\r
     \r
+    listElement.find('[wlxml-class=item]').each(function() {\r
+        $(this).attr('wlxml-class', '');\r
+    });;\r
+    listElement.children().unwrap();\r
     \r
-    \r
+}\r
+\r
+Canvas.prototype.insideList = function(options) {\r
+    if(options.pointer) {\r
+        if(options.pointer.klass === 'list-items' || options.pointer.klass === 'item')\r
+            return true;\r
+        var pointerElement = $(this.content.find('#' + options.pointer.id));\r
+        return pointerElement.parents('list-items').length > 0;\r
+    }\r
+    return false;\r
 }\r
 \r
 \r