From e85ada45e95f966b5b3640fed9e7a374d9e25375 Mon Sep 17 00:00:00 2001
From: Ian Storm Taylor <ian@ianstormtaylor.com>
Date: Fri, 17 Jun 2016 18:36:47 -0700
Subject: [PATCH] more refactoring

---
 lib/components/leaf.js | 12 ++++++------
 lib/models/state.js    |  1 -
 lib/models/text.js     |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/components/leaf.js b/lib/components/leaf.js
index ec35904a2..f63fab2bc 100644
--- a/lib/components/leaf.js
+++ b/lib/components/leaf.js
@@ -51,9 +51,9 @@ class Leaf extends React.Component {
     if (hasStart && hasEnd) {
       native.removeAllRanges()
       const range = document.createRange()
-      range.setStart(el, anchorOffset - offset)
+      range.setStart(el, anchorOffset - start)
       native.addRange(range)
-      native.extend(el, focusOffset - offset)
+      native.extend(el, focusOffset - start)
       return
     }
 
@@ -64,10 +64,10 @@ class Leaf extends React.Component {
       if (hasStart) {
         native.removeAllRanges()
         const range = document.createRange()
-        range.setStart(el, anchorOffset - offset)
+        range.setStart(el, anchorOffset - start)
         native.addRange(range)
       } else if (hasEnd) {
-        native.extend(el, focusOffset - offset)
+        native.extend(el, focusOffset - start)
       }
     }
 
@@ -79,14 +79,14 @@ class Leaf extends React.Component {
       if (hasEnd) {
         native.removeAllRanges()
         const range = document.createRange()
-        range.setStart(el, focusOffset - offset)
+        range.setStart(el, focusOffset - start)
         native.addRange(range)
       } else if (hasStart) {
         const endNode = native.focusNode
         const endOffset = native.focusOffset
         native.removeAllRanges()
         const range = document.createRange()
-        range.setStart(el, anchorOffset - offset)
+        range.setStart(el, anchorOffset - start)
         native.addRange(range)
         native.extend(endNode, endOffset)
       }
diff --git a/lib/models/state.js b/lib/models/state.js
index 712ffa820..b802f60ef 100644
--- a/lib/models/state.js
+++ b/lib/models/state.js
@@ -2,7 +2,6 @@
 import Selection from './selection'
 import Node from './node'
 import Text from './text'
-import convertRangesToCharacters from '../utils/convert-ranges-to-characters'
 import toCamel from 'to-camel-case'
 import { OrderedMap, Record, Stack } from 'immutable'
 
diff --git a/lib/models/text.js b/lib/models/text.js
index 194470332..a8764cf97 100644
--- a/lib/models/text.js
+++ b/lib/models/text.js
@@ -1,5 +1,4 @@
 
-import convertRangesToCharacters from '../utils/convert-ranges-to-characters'
 import uid from 'uid'
 import { List, Record } from 'immutable'