From 599a111c528aa926aafaf5eb46493042efd1a61b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 3 Jul 2013 14:19:46 +0200 Subject: [PATCH] unwrapping nodes --- modules/documentCanvas/canvas.js | 55 +++++++++++++++++++++ modules/documentCanvas/canvasManager.js | 3 ++ modules/documentCanvas/tests/canvas.test.js | 29 +++++++++++ modules/documentToolbar/template.html | 3 ++ 4 files changed, 90 insertions(+) diff --git a/modules/documentCanvas/canvas.js b/modules/documentCanvas/canvas.js index a1f516d..ab8a578 100644 --- a/modules/documentCanvas/canvas.js +++ b/modules/documentCanvas/canvas.js @@ -97,6 +97,61 @@ Canvas.prototype.nodeWrap = function(options) { options._with.dom.after(suffixOutside); }; +Canvas.prototype.nodeUnwrap = function(options) { + + var removeWithJoin = function(node) { + var contents = node.parent().contents(), + idx = contents.index(node), + prev = idx > 0 ? contents[idx-1] : null, + next = idx + 1 < contents.length ? contents[idx+1] : null; + + if(prev && prev.nodeType === 3 && next && next.nodeType === 3) { + prev.data = prev.data + next.data; + $(next).remove(); + } + node.remove(); + }; + + var toUnwrap = $(this.content.find('#' + options.node.getId()).get(0)); + + + var parent = toUnwrap.parent(); + var parentContents = parent.contents(); + + if(toUnwrap.contents().length !== 1 || toUnwrap.contents()[0].nodeType !== 3) + return false; + + var idx = parentContents.index(toUnwrap); + + var combineWith, + action; + + if(idx > 0 && parentContents[idx-1].nodeType === 3) { + combineWith = parentContents[idx-1]; + action = 'append'; + } else if(idx + 1 < parentContents.length && parentContents[idx+1].nodeType === 3) { + combineWith = parentContents[idx+1]; + action = 'prepend'; + } + + if(combineWith) { + var text = + (action === 'prepend' ? toUnwrap.text() : '') + + combineWith.data + + (action === 'append' ? toUnwrap.text() : '') + ; + combineWith.data = text; + removeWithJoin(toUnwrap); + } else { + if(parentContents.length === 1 || idx === 0) { + parent.append(toUnwrap.text()); + } else { + toUnwrap.prev().after(toUnwrap.text()); + } + toUnwrap.remove(); + } +}; + Canvas.prototype.nodeSplit = function(options) { options = _.extend({textNodeIdx: 0}, options); diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js index 3b7f72d..edb599c 100644 --- a/modules/documentCanvas/canvasManager.js +++ b/modules/documentCanvas/canvasManager.js @@ -245,6 +245,9 @@ Manager.prototype.command = function(command, meta) { this.sandbox.publish('contentChanged'); //} } + } else if(command === 'unwrap-node') { + this.canvas.nodeUnwrap({node: canvasNode.create(pos.parentNode)}); + this.sandbox.publish('contentChanged'); } }; diff --git a/modules/documentCanvas/tests/canvas.test.js b/modules/documentCanvas/tests/canvas.test.js index 53f4aee..5dc017b 100644 --- a/modules/documentCanvas/tests/canvas.test.js +++ b/modules/documentCanvas/tests/canvas.test.js @@ -76,6 +76,35 @@ define([ c.nodeWrap({inside: header, _with: wrapper, offsetStart: 6, offsetEnd: 4, textNodeIdx: [0,2]}); assertDomEqual(c.getContent(), '
Alice has a small cat
'); }); + + test('unwrap text', function() { + var c = canvas.create('
Alice has a cat
'); + var span = c.findNodes({tag:'span'})[0]; + c.nodeUnwrap({node: span}); + assertDomEqual(c.getContent(), '
Alice has a cat
'); + }); + + test('unwrap text - first text node', function() { + var c = canvas.create('
Alice has a cat
'); + var span = c.findNodes({tag:'span'})[0]; + c.nodeUnwrap({node: span}); + assertDomEqual(c.getContent(), '
Alice has a cat
'); + }); + + test('unwrap text - only text node', function() { + var c = canvas.create('
Alice
'); + var span = c.findNodes({tag:'span'})[0]; + c.nodeUnwrap({node: span}); + assertDomEqual(c.getContent(), '
Alice
'); + }); + + + test('unwrap text - non text neighbours', function() { + var c = canvas.create('
a
Alice
b
'); + var span = c.findNodes({tag:'span'})[0]; + c.nodeUnwrap({node: span}); + assertDomEqual(c.getContent(), '
a
Alice
b
'); + }); test('split node', function() { var c = canvas.create('
Header 1
'); diff --git a/modules/documentToolbar/template.html b/modules/documentToolbar/template.html index 31ecbf6..62f4070 100644 --- a/modules/documentToolbar/template.html +++ b/modules/documentToolbar/template.html @@ -18,6 +18,9 @@ +
+ +
-- 2.20.1