From dc2866315b153c44bd3329876a15cd3629f456a3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 21 Sep 2021 22:06:24 +0530
Subject: [PATCH] Refactor code into separate functions

---
 src/pyj/read_book/cfi.pyj | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pyj/read_book/cfi.pyj b/src/pyj/read_book/cfi.pyj
index 5a1b1ed054..c73d79e223 100644
--- a/src/pyj/read_book/cfi.pyj
+++ b/src/pyj/read_book/cfi.pyj
@@ -701,7 +701,7 @@ def scroll_to(cfi, callback, doc):  # {{{
     if jstype(decoded.time) is 'number':
         set_current_time(decoded.node, decoded.time)
 
-    if decoded.range is not None:
+    def handle_text_node():
         # Character offset
         r = decoded.range
         so, eo = r.startOffset, r.endOffset
@@ -721,7 +721,7 @@ def scroll_to(cfi, callback, doc):  # {{{
         span.setAttribute('style', 'border-width: 0; padding: 0; margin: 0')
         r.surroundContents(span)
         scroll_viewport.scroll_into_view(span)
-        fn = def():
+        return def():
             nonlocal original_node, r
             # Remove the span and get the new position now that scrolling
             # has (hopefully) completed
@@ -770,7 +770,8 @@ def scroll_to(cfi, callback, doc):  # {{{
 
             if callback:
                 callback(doc_x, doc_y)
-    else:
+
+    def handle_element_node():
         node = decoded.node
         if node.nodeType is Node.TEXT_NODE:
             node = decoded.node = node.parentNode
@@ -778,7 +779,7 @@ def scroll_to(cfi, callback, doc):  # {{{
             return
         scroll_viewport.scroll_into_view(node)
 
-        fn = def():
+        return def():
             doc_x, doc_y = decoded_node_or_spatial_offset_to_document_position(decoded)
 
             # Abort if CFI position is invalid
@@ -796,6 +797,11 @@ def scroll_to(cfi, callback, doc):  # {{{
             if callback:
                 callback(doc_x, doc_y)
 
+    if decoded.range is not None:
+        fn = handle_text_node()
+    else:
+        fn = handle_element_node()
+
     setTimeout(fn, 10)
 
 # }}}