takeRange -> readRange

bustle · Aug 10, 2015 · 3503e5e · 3503e5e
1 parent 34945e8
commit 3503e5e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/js/models/cursor.js b/src/js/models/cursor.js
@@ -98,7 +98,7 @@ export default class Cursor {
     const {result:startSection} = detectParentNode(startContainer, isSectionElement);
     const {result:endSection} = detectParentNode(endContainer, isSectionElement);
 
-    return sections.takeRange(startSection, endSection);
+    return sections.readRange(startSection, endSection);
   }
 
   // moves cursor to the start of the section

diff --git a/src/js/models/markup-section.js b/src/js/models/markup-section.js
@@ -102,8 +102,8 @@ export default class Section extends LinkedItem {
       ];
     }
 
-    left = (middle.prev ? this.markers.takeRange(null, middle.prev) : []);
-    right = (middle.next ? this.markers.takeRange(middle.next, null) : []);
+    left = (middle.prev ? this.markers.readRange(null, middle.prev) : []);
+    right = (middle.next ? this.markers.readRange(middle.next, null) : []);
 
     let leftLength = left.reduce((prev, cur) => prev + cur.length, 0);
     let middleOffset = offset - leftLength;

diff --git a/src/js/utils/linked-list.js b/src/js/utils/linked-list.js
@@ -99,7 +99,7 @@ export default class LinkedList {
       item = item.next;
     }
   }
-  takeRange(startItem, endItem) {
+  readRange(startItem, endItem) {
     let items = [];
     let item = startItem || this.head;
     while (item) {
@@ -112,7 +112,7 @@ export default class LinkedList {
     return items;
   }
   toArray() {
-    return this.takeRange();
+    return this.readRange();
   }
   detect(callback, item=this.head) {
     while (item) {

diff --git a/tests/unit/utils/linked-list-test.js b/tests/unit/utils/linked-list-test.js
@@ -211,7 +211,7 @@ test(`#forEach iterates one`, (assert) => {
   assert.deepEqual(indexes, [0], 'indexes correct');
 });
 
-test(`#takeRange walks from start to end`, (assert) => {
+test(`#readRange walks from start to end`, (assert) => {
   let list = new LinkedList();
   let itemOne = new LinkedItem();
   let itemTwo = new LinkedItem();
@@ -225,10 +225,10 @@ test(`#takeRange walks from start to end`, (assert) => {
     items.push(item);
     indexes.push(index);
   });
-  assert.deepEqual(list.takeRange(itemOne, itemOne), [itemOne], 'items correct');
-  assert.deepEqual(list.takeRange(itemTwo, itemThree), [itemTwo, itemThree], 'items correct');
-  assert.deepEqual(list.takeRange(itemOne, itemTwo), [itemOne, itemTwo], 'items correct');
-  assert.deepEqual(list.takeRange(itemOne, null), [itemOne, itemTwo, itemThree], 'items correct');
+  assert.deepEqual(list.readRange(itemOne, itemOne), [itemOne], 'items correct');
+  assert.deepEqual(list.readRange(itemTwo, itemThree), [itemTwo, itemThree], 'items correct');
+  assert.deepEqual(list.readRange(itemOne, itemTwo), [itemOne, itemTwo], 'items correct');
+  assert.deepEqual(list.readRange(itemOne, null), [itemOne, itemTwo, itemThree], 'items correct');
 });
 
 test(`#toArray builds array`, (assert) => {