Adding jshint grunt task

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

diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js
index 9ae3a53..23cdf0a 100644 (file)
--- a/modules/documentCanvas/canvas.js
+++ b/modules/documentCanvas/canvas.js
@@ -62,21 +62,39 @@ Canvas.prototype.nodeInsertAfter = function(options) {
 };\r
 \r
 Canvas.prototype.nodeWrap = function(options) {\r
 };\r
 \r
 Canvas.prototype.nodeWrap = function(options) {\r

-    var element = $(this.content.find('#' + options.inside.getId()).get(0));\r
-\r
-    var elementContents = element.contents();\r
-    if(elementContents.length !== 1 || elementContents.get(0).nodeType != 3)\r
-        return false;\r
-    var textElement = elementContents.get(0);\r
-\r
-    var prefix = textElement.data.substr(0, options.offsetStart);\r
-    var suffix = textElement.data.substr(options.offsetEnd);\r
-    var core = textElement.data.substr(options.offsetStart, options.offsetEnd - options.offsetStart);\r
-    options._with.setContent(core);\r
-\r
-    $(textElement).replaceWith(options._with.dom);\r
-    options._with.dom.before(prefix);\r
-    options._with.dom.after(suffix);\r
+    options = _.extend({textNodeIdx: 0}, options);\r
+    if(typeof options.textNodeIdx === 'number')\r
+        options.textNodeIdx = [options.textNodeIdx];\r
+    \r
+    var container = $(this.content.find('#' + options.inside.getId()).get(0)),\r
+        containerContent = container.contents(),\r
+        idx1 = Math.min.apply(Math, options.textNodeIdx),\r
+        idx2 = Math.max.apply(Math, options.textNodeIdx),\r
+        textNode1 = $(containerContent.get(idx1)),\r
+        textNode2 = $(containerContent.get(idx2)),\r
+        sameNode = textNode1.get(0) === textNode2.get(0),\r
+        prefixOutside = textNode1.text().substr(0, options.offsetStart),\r
+        prefixInside = textNode1.text().substr(options.offsetStart),\r
+        suffixInside = textNode2.text().substr(0, options.offsetEnd),\r
+        suffixOutside = textNode2.text().substr(options.offsetEnd)\r
+    ;\r
+    \r
+    textNode1.after(options._with.dom);\r
+    textNode1.detach();\r
+    \r
+    options._with.dom.before(prefixOutside);\r
+    if(sameNode) {\r
+        var core = textNode1.text().substr(options.offsetStart, options.offsetEnd - options.offsetStart);\r
+        options._with.setContent(core);\r
+    } else {\r
+        textNode2.detach();\r
+        options._with.dom.append(prefixInside);\r
+        for(var i = idx1 + 1; i < idx2; i++) {\r
+            options._with.dom.append(containerContent[i]);\r
+        }\r
+        options._with.dom.append(suffixInside);\r
+    }\r
+    options._with.dom.after(suffixOutside);\r

 };\r
 \r
 Canvas.prototype.nodeSplit = function(options) {\r
 };\r
 \r
 Canvas.prototype.nodeSplit = function(options) {\r


@@ -98,7 +116,7 @@ Canvas.prototype.nodeSplit = function(options) {
         var node = this;\r
         if(passed)\r
             succeedingNodes.push(node);\r
         var node = this;\r
         if(passed)\r
             succeedingNodes.push(node);\r

-        if(node.isSameNode(textNode.get(0)))\r
+        if(node === textNode.get(0))\r

             passed = true;\r
     });\r
     \r
             passed = true;\r
     });\r
     \r


@@ -125,7 +143,7 @@ Canvas.prototype.nodeRemove = function(options) {
 Canvas.prototype.listCreate = function(options) {\r
     var element1 = $(this.content.find('#' + options.start.getId()).get(0));\r
     var element2 = $(this.content.find('#' + options.end.getId()).get(0));\r
 Canvas.prototype.listCreate = function(options) {\r
     var element1 = $(this.content.find('#' + options.start.getId()).get(0));\r
     var element2 = $(this.content.find('#' + options.end.getId()).get(0));\r

-    if(!element1.parent().get(0).isSameNode(element2.parent().get(0)))\r
+    if(!element1.parent().get(0) === element2.parent().get(0))\r

         return false;\r
         \r
     var parent = element1.parent();\r
         return false;\r
         \r
     var parent = element1.parent();\r


@@ -142,7 +160,7 @@ Canvas.prototype.listCreate = function(options) {
     var canvas = this;\r
     parent.contents().each(function() {\r
         var node = this;\r
     var canvas = this;\r
     parent.contents().each(function() {\r
         var node = this;\r

-        if(node.isSameNode(element1.get(0)))\r
+        if(node === element1.get(0))\r

             place = 'inside';\r
         if(place === 'inside') {\r
             var $node;\r
             place = 'inside';\r
         if(place === 'inside') {\r
             var $node;\r


@@ -156,12 +174,24 @@ Canvas.prototype.listCreate = function(options) {
             $node.attr('wlxml-class', 'item');\r
             nodesToWrap.push($node);\r
         }\r
             $node.attr('wlxml-class', 'item');\r
             nodesToWrap.push($node);\r
         }\r

-        if(node.isSameNode(element2.get(0)))\r
+        if(node === element2.get(0))\r

             return false;\r
     });\r
     \r
             return false;\r
     });\r
     \r

-    var list = canvasNode.create({tag: 'div', klass: 'list-items'}).dom; //this._createNode('div', 'list-items');\r
-    element1.before(list);\r
+    var list = canvasNode.create({tag: 'div', klass: 'list-items' + (options.type === 'enum' ? '-enum' : '')}).dom; //this._createNode('div', 'list-items');\r
+    \r
+    var parentNode = options.start.parent();\r
+    \r
+    var toret;\r
+    if(parentNode && parentNode.isOfClass('list-items')) {\r
+        list.wrap('<div wlxml-tag="div" wlxml-class="item" class="canvas-silent-item">');\r
+        toret = list.parent();\r
+    } else {\r
+        toret = list;\r
+    }\r
+        \r
+    \r
+    element1.before(toret);\r

     \r
     nodesToWrap.forEach(function(node) {\r
         node.remove();\r
     \r
     nodesToWrap.forEach(function(node) {\r
         node.remove();\r


@@ -172,11 +202,21 @@ Canvas.prototype.listCreate = function(options) {
 Canvas.prototype.listRemove = function(options) {\r
     var pointerElement = $(this.content.find('#' + options.pointer.getId()));\r
     var listElement = options.pointer.getClass() === 'list-items' ? pointerElement : \r
 Canvas.prototype.listRemove = function(options) {\r
     var pointerElement = $(this.content.find('#' + options.pointer.getId()));\r
     var listElement = options.pointer.getClass() === 'list-items' ? pointerElement : \r

-        pointerElement.parent('[wlxml-class="list-items"][wlxml-tag]');\r
+        pointerElement.parents('[wlxml-class|="list-items"][wlxml-tag]');\r

     \r
     \r

-    listElement.find('[wlxml-class=item]').each(function() {\r
-        $(this).removeAttr('wlxml-class');\r
-    });\r
+    var nested = false;\r
+    if(listElement.length > 1) {\r
+        listElement = $(listElement[0]);\r
+        nested = true;\r
+    }\r
+    \r
+    if(nested) {\r
+        listElement.unwrap();\r
+    } else {\r
+        listElement.find('[wlxml-class=item]').each(function() {\r
+            $(this).removeAttr('wlxml-class');\r
+        });\r
+    }\r

     listElement.children().unwrap();\r
 };\r
 \r
     listElement.children().unwrap();\r
 };\r
 \r


@@ -190,10 +230,10 @@ Canvas.prototype.getPrecedingNode = function(options) {
 \r
 Canvas.prototype.nodeInsideList = function(options) {\r
     if(options.node) {\r
 \r
 Canvas.prototype.nodeInsideList = function(options) {\r
     if(options.node) {\r

-        if(options.node.getClass() === 'list-items' || options.node.getClass() === 'item')\r
+        if(options.node.isOfClass('list-items') || options.node.isOfClass('item'))\r

             return true;\r
         var pointerElement = $(this.content.find('#' + options.node.getId()));\r
             return true;\r
         var pointerElement = $(this.content.find('#' + options.node.getId()));\r

-        return pointerElement.parents('list-items, item').length > 0;\r
+        return pointerElement.parents('[wlxml-class=list-items], [wlxml-class=item]').length > 0;\r

     }\r
     return false;\r
 };\r
     }\r
     return false;\r
 };\r