Remove aloha.ranges from API

Author: Petro Salema

src/api.js

@@ -15,6 +15,7 @@ define([
 	'boromir',
 	'boundaries',
 	'browsers',
+	'carets',
 	'colors',
 	'content',
 	'delayed-map',
@@ -38,7 +39,6 @@ define([
 	'overrides',
 	'paste',
 	'paths',
-	'ranges',
 	'record',
 	'selection-change',
 	'selections',
@@ -55,6 +55,7 @@ define([
 	Boromir,
 	Boundaries,
 	Browsers,
+	Carets,
 	Colors,
 	Content,
 	DelayedMap,
@@ -78,7 +79,6 @@ define([
 	Overrides,
 	Paste,
 	Paths,
-	Ranges,
 	Record,
 	SelectionChange,
 	Selections,
@@ -453,30 +453,16 @@ define([
 	exports['overrides']['nodeToState'] = Overrides.nodeToState;
 
 	exports['paste'] = new Object();
-	exports['handle'] = Paste.handle;
+	exports['paste']['handle'] = Paste.handle;
 
 	exports['paths'] = new Object();
 	exports['paths']['toBoundary']   = Paths.toBoundary;
 	exports['paths']['fromBoundary'] = Paths.fromBoundary;
 
-	exports['ranges'] = new Object();
-	exports['ranges']['box']                         = Ranges.box;
-	exports['ranges']['get']                         = Ranges.get;
-	exports['ranges']['create']                      = Ranges.create;
-	exports['ranges']['equals']                      = Ranges.equals;
-	exports['ranges']['collapseToEnd']               = Ranges.collapseToEnd;
-	exports['ranges']['collapseToStart']             = Ranges.collapseToStart;
-	exports['ranges']['trim']                        = Ranges.trim;
-	exports['ranges']['trimClosingOpening']          = Ranges.trimClosingOpening;
-	exports['ranges']['trimBoundaries']              = Ranges.trimBoundaries;
-	exports['ranges']['expandBoundaries']            = Ranges.expandBoundaries;
-	exports['ranges']['nearestEditingHost']          = Ranges.nearestEditingHost;
-	exports['ranges']['expand']                      = Ranges.expand;
-	exports['ranges']['envelopeInvisibleCharacters'] = Ranges.envelopeInvisibleCharacters;
-	exports['ranges']['fromPosition']                = Ranges.fromPosition;
-	exports['ranges']['fromBoundaries']              = Ranges.fromBoundaries;
-	exports['ranges']['showHint']                    = Ranges.showHint;
-	exports['ranges']['hideHint']                    = Ranges.hideHint;
+	exports['carets'] = new Object();
+	exports['carets']['box']      = Carets.box;
+	exports['carets']['showHint'] = Carets.showHint;
+	exports['carets']['hideHint'] = Carets.hideHint;
 
 	exports['selectionchange'] = new Object();
 	exports['selectionchange']['handler']       = SelectionChange.handler;

src/autoformat.js

@@ -10,7 +10,6 @@ define([
 	'dom',
 	'maps',
 	'keys',
-	'ranges',
 	'editing',
 	'mutation',
 	'searching',
@@ -21,7 +20,6 @@ define([
 	Dom,
 	Maps,
 	Keys,
-	Ranges,
 	Editing,
 	Mutation,
 	Searching,
@@ -68,11 +66,8 @@ define([
 	}
 
 	function ascii(symbol, start, end) {
-		var range = Ranges.fromBoundaries(start, end);
-		var boundaries = Boundaries.fromRange(
-			Ranges.envelopeInvisibleCharacters(range)
-		);
-		var boundary = Editing.remove(boundaries[0], boundaries[1])[0];
+		end = Traversing.envelopeInvisibleCharacters(end);
+		var boundary = Editing.remove(start, end)[0];
 		return Mutation.insertTextAtBoundary(symbol, boundary, true);
 	}
 
@@ -163,7 +158,7 @@ define([
 		}
 		if (handler) {
 			boundary = handler(start, boundary);
-			event.range = Ranges.fromBoundaries(boundary, boundary);
+			event.range = Boundaries.range(boundary, boundary);
 		}
 		return event;
 	}

src/boundaries.js

@@ -7,10 +7,12 @@
  */
 define([
 	'dom',
+	'ranges',
 	'arrays',
 	'assert'
 ], function (
 	Dom,
+	Ranges,
 	Arrays,
 	Assert
 ) {
@@ -531,31 +533,6 @@ define([
 		}
 	}
 
-	/**
-	 * Calculates the cumulative length of contiguous text nodes immediately
-	 * preceding the given boundary.
-	 *
-	 * @param  {Boundary} boundary
-	 * @return {number}
-	 */
-	function precedingTextLength(boundary) {
-		var node;
-		var len;
-		boundary = normalize(boundary);
-		if (isNodeBoundary(boundary)) {
-			len = 0;
-			node = nodeBefore(boundary);
-		} else {
-			len = offset(boundary);
-			node = container(boundary).previousSibling;
-		}
-		while (node && Dom.isTextNode(node)) {
-			len += Dom.nodeLength(node);
-			node = node.previousSibling;
-		}
-		return len;
-	}
-
 	/**
 	 * Gets the boundaries of the currently selected range from the given
 	 * document element.
@@ -570,6 +547,22 @@ define([
 		     : null;
 	}
 
+	/**
+	 * Creates a range based on the given start and end boundaries.
+	 *
+	 * @param  {Boundary} start
+	 * @param  {Boundary} end
+	 * @return {Range}
+	 */
+	function toRange(start, end) {
+		return Ranges.create(
+			container(start),
+			offset(start),
+			container(end),
+			offset(end)
+		);
+	}
+
 	/**
 	 * Sets the a range to the browser selection according to the given start
 	 * and end boundaries.  This operation will cause the selection to be
@@ -582,15 +575,9 @@ define([
 		if (!end) {
 			end = start;
 		}
-		var sc = container(start);
-		var so = offset(start);
-		var ec = container(end);
-		var eo = offset(end);
-		var doc = sc.ownerDocument;
+		var range = toRange(start, end);
+		var doc = range.commonAncestorContainer.ownerDocument;
 		var selection = doc.getSelection();
-		var range = doc.createRange();
-		range.setStart(sc, so);
-		range.setEnd(ec, eo);
 		selection.removeAllRanges();
 		selection.addRange(range);
 	}
@@ -603,18 +590,17 @@ define([
 	 * @return {Node}
 	 */
 	function commonContainer(start, end) {
-		var sc = container(start);
-		var so = offset(start);
-		var ec = container(end);
-		var eo = offset(end);
-		var doc = Dom.Nodes.DOCUMENT === sc.nodeType ? sc : sc.ownerDocument;
-		var range = doc.createRange();
-		range.setStart(sc, so);
-		range.setEnd(ec, eo);
-		return range.commonAncestorContainer;
+		return toRange(start, end).commonAncestorContainer;
+	}
+
+	function fromPosition(x, y, doc) {
+		var range = Ranges.fromPosition(x, y, doc);
+		return range || fromRange(range);
 	}
 
 	return {
+		fromPosition        : fromPosition,
+
 		get                 : get,
 		select              : select,
 
@@ -641,6 +627,8 @@ define([
 		setRangeStart       : setRangeStart,
 		setRangeEnd         : setRangeEnd,
 
+		range               : toRange,
+
 		isAtStart           : isAtStart,
 		isAtEnd             : isAtEnd,
 		isAtRawStart        : isAtRawStart,
@@ -665,8 +653,6 @@ define([
 		nodeAfter           : nodeAfter,
 		nodeBefore          : nodeBefore,
 
-		precedingTextLength : precedingTextLength,
-
 		commonContainer     : commonContainer
 	};
 });