Introducing MutationsTrees

Petro Salema · Petro Salema · commit 693d220b343f · 2014-08-25T18:28:32.000+02:00
diff --git a/sandbox/index.html b/sandbox/index.html
@@ -59,7 +59,10 @@
 		</style>
 	</head>
 	<body>
-		<div class="aloha-editable"><p>one <b>two</b> three</p></div>
+		<div class="aloha-editable">starting<i>foobar</i><p
+			><span>one</span> <u><b>two</b> <i>three</i></u></p> <h6
+			>four</h6
+		></div>
 
 		<br/>
 
@@ -128,6 +131,44 @@ <h1>Aloha Editor</h1>
 				}
 				function main(aloha) {
 					aloha.arrays.coerce(document.querySelectorAll('.aloha-editable')).forEach(aloha);
+					aloha.metaview.toggle(document.querySelector('.aloha-editable'),{outline:true,padding: true});
+
+					/*
+					var boundaries = [
+						aloha.boundaries.create(document.querySelector('.aloha-editable'), 0),
+						aloha.boundaries.create(document.querySelector('.aloha-editable'), 1),
+						aloha.boundaries.create(document.querySelector('.aloha-editable'), 2),
+						aloha.boundaries.create(document.querySelector('.aloha-editable'), 1),
+						aloha.boundaries.create(document.querySelector('i').firstChild, 1),
+						aloha.boundaries.create(document.querySelector('i').firstChild, 2),
+						aloha.boundaries.create(document.querySelector('i').firstChild, 2),
+						aloha.boundaries.fromEndOfNode(document.querySelector('i')),
+						aloha.boundaries.fromNode(document.querySelector('i')),
+						aloha.boundaries.create(document.querySelector('span').firstChild, 2),
+						aloha.boundaries.create(document.querySelector('i').firstChild, 3),
+						aloha.boundaries.create(document.querySelector('h6').firstChild, 3)
+					];
+					*/
+
+					var editable = document.querySelector('.aloha-editable');
+					var boundaries = [
+						aloha.boundaries.create(editable.querySelector('h6').firstChild, 2),
+						aloha.boundaries.create(document.querySelector('b').firstChild, 0),
+						aloha.boundaries.create(document.querySelector('b').firstChild, 1),
+						aloha.boundaries.create(document.querySelector('b').firstChild, 2),
+						aloha.boundaries.create(document.querySelector('b').firstChild, 3),
+						aloha.boundaries.create(document.querySelector('b'), 1),
+						aloha.boundaries.create(document.querySelector('b'), 1),
+						aloha.boundaries.fromNode(document.querySelector('b')),
+						aloha.boundaries.create(document.querySelector('b').firstChild, 2)
+					];
+					var limit = editable; //.querySelector('b').parentNode.parentNode;
+					var splitBoundary = aloha.boundaries.create(limit.querySelector('b').firstChild, 1);
+					var path = aloha.paths.fromBoundary(limit, splitBoundary);
+					var tree = aloha.MutationTrees.create(limit, boundaries);
+					var result = aloha.MutationTrees.split(tree, path)
+					var updated = aloha.MutationTrees.update(result[0]);
+					console.log(updated.domNode(), aloha.markers.hint(aloha.paths.toBoundary(updated.domNode(), result[1])));
 				}
 				if ('undefined' === typeof aloha) {
 					setVersion('src');
diff --git a/src/api.js b/src/api.js
@@ -47,7 +47,8 @@ define([
 	'transform',
 	'traversing',
 	'typing',
-	'undo'
+	'undo',
+	'mutation-trees'
 ], function (
 	Arrays,
 	Blocks,
@@ -86,7 +87,8 @@ define([
 	Transform,
 	Traversing,
 	Typing,
-	Undo
+	Undo,
+	MutationTrees
 ) {
 	'use strict';
 
@@ -550,5 +552,10 @@ define([
 	exports['undo']['undo']               = Undo.undo;
 	exports['undo']['redo']               = Undo.redo;
 
+	exports['MutationTrees'] = new Object();
+	exports['MutationTrees'].split  = MutationTrees.split;
+	exports['MutationTrees'].create = MutationTrees.create;
+	exports['MutationTrees'].update = MutationTrees.update;
+
 	return exports;
 });
diff --git a/src/boromir.js b/src/boromir.js
@@ -621,7 +621,7 @@ define([
 	 * boromir nodes, otherwise the behviour is undefined and may cause
 	 * errors to be thrown. The assumption that the tree wasn't modified
 	 * is necessary so that the DOM can be updated in the most efficient
-	 * manner possible, without perorming any redundant read operations
+	 * manner possible, without peforming any redundant read operations
 	 * on the DOM.
 	 *
 	 * For the reason above, after the DOM has been updated, the boromir
diff --git a/src/metaview.js b/src/metaview.js
@@ -14,7 +14,7 @@ define(['dom'], function (Dom) {
 
 		// outlines
 		= '.✪{outline:5px solid #fce05e;}'
-		+ '.✪ td,.✪ th,.✪ b,.✪ i,.✪ u,.✪ p,.✪ ul,.✪ ol,.✪ li,.✪ h1,.✪ h2,.✪ h3,.✪ h4,.✪ h5,.✪ h6,.✪ div{border:1px solid rgba(0,0,0,0.1)}'
+		+ '.✪ td,.✪ th,.✪ b,.✪ i,.✪ u,.✪ p,.✪ ul,.✪ ol,.✪ li,.✪ h1,.✪ h2,.✪ h3,.✪ h4,.✪ h5,.✪ h6,.✪ div,.✪ span{border:1px solid rgba(0,0,0,0.1)}'
 		+ '.✪ p,.✪ ul,.✪ ol,.✪ h1,.✪ h2,.✪ h3,.✪ h4,.✪ h5,.✪ h6,.✪ div{border-width:2px}'
 		+ '.✪ b{border-color:#f47d43}'
 		+ '.✪ i{border-color:#82b5e0}'
diff --git a/src/mutation-trees.js b/src/mutation-trees.js
diff --git a/src/paste.js b/src/paste.js

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ define([`
`621`	`621`	`* boromir nodes, otherwise the behviour is undefined and may cause`
`622`	`622`	`* errors to be thrown. The assumption that the tree wasn't modified`
`623`	`623`	`* is necessary so that the DOM can be updated in the most efficient`
`624`		`- * manner possible, without perorming any redundant read operations`
	`624`	`+ * manner possible, without peforming any redundant read operations`
`625`	`625`	`* on the DOM.`
`626`	`626`	`*`
`627`	`627`	`* For the reason above, after the DOM has been updated, the boromir`