cleanup

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

diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js
index eb0fd0b..80d3915 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
 }\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
 }\r
 \r
 Canvas.prototype.toXML = function() {\r


@@ -147,23 +147,42 @@ Canvas.prototype.createList = function(options) {
             else {\r
                 $node = $(node);\r
             }\r
             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
             nodesToWrap.push($node);\r
         }\r
         if(node.isSameNode(element2.get(0)))\r

-            return;\r
+            return false;\r

     });\r
     \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
     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
     \r

+    listElement.find('[wlxml-class=item]').each(function() {\r
+        $(this).attr('wlxml-class', '');\r
+    });;\r
+    listElement.children().unwrap();\r

     \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
 }\r
 \r
 \r