X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=editor.coffee;h=80141882067bfc78126ecec33d2d2bdfd39a45fe;hb=833a4fc56ec6e313b2899714be4fee2ff703eeff;hp=e3b922e4a80ed78fadf11c3d5718a869daf4860d;hpb=7eb32af0eb10fd084b9179b1a266bd5236caebc9;p=peach-html5-editor.git

diff --git a/editor.coffee b/editor.coffee
index e3b922e..8014188 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -19,20 +19,23 @@ TYPE_TEXT = peach_parser.TYPE_TEXT
 TYPE_COMMENT = peach_parser.TYPE_COMMENT
 TYPE_DOCTYPE = peach_parser.TYPE_DOCTYPE
 
-# text nodes don't have getBoundingClientRect(), so wrap it in a span, measure
-# and then put it back
+debug_dot_at = (doc, x, y) ->
+	el = doc.createElement 'div'
+	el.setAttribute 'style', "position: absolute; left: #{x}px; top: #{y}px; width: 1px; height: 3px; background-color: red"
+	doc.body.appendChild el
+	#console.log(new Error().stack)
+
+# text nodes don't have getBoundingClientRect(), so use selection api to find
+# it.
 get_text_bounding_rect = (el) ->
-	span = el.ownerDocument.createElement 'span'
-	el.parentNode.replaceChild span, el
-	span.appendChild el
-	ret = span.getBoundingClientRect()
-	span.parentNode.replaceChild el, span
-	return ret
 get_el_bounds = (el) ->
-	if el.getBoundingClientRect
+	if el.getBoundingClientRect?
 		rect = el.getBoundingClientRect()
 	else
-		rect = get_text_bounding_rect el
+		# text nodes don't have getBoundingClientRect(), so use range api
+		range = el.ownerDocument.createRange()
+		range.selectNodeContents el
+		rect = range.getBoundingClientRect()
 	doc = el.ownerDocument.documentElement
 	win = el.ownerDocument.defaultView
 	y_fix = win.pageYOffset - doc.clientTop
@@ -46,55 +49,43 @@ get_el_bounds = (el) ->
 
 # figure out the x/y coordinates of where the cursor should be if it's at
 # position ``i`` within text node ``n``
-#
-# implementation: insert a span tag where we want the cursor, and ask the
-# browser where it put that span
 window.cursor_to_xyh = cursor_to_xyh = (n, i) ->
-	parent = n.el.parentNode
-	els = []
-	txts = []
+	range = document.createRange()
 	plus_width = false
-	if n.text.length < 2
-		bounds = get_el_offset n.el
-		if i is 1
-			plus_width = true
+	if n.text.length is 0
+		range.setStart n.el, i
+		range.setEnd n.el, i
+	if i is n.text.length
+		range.setStart n.el, i - 1
+		range.setEnd n.el, i
+		plus_width = true
 	else
-		if i is 0 # cursor at start of text
-			check_i = 0
-			txts.push n.text.substr 0, 1
-			txts.push n.text.substr 1
-		else if i is n.text.length # cursor at end of text
-			check_i = 1
-			plus_width = true
-			txts.push n.text.substr 0, n.text.length - 1
-			txts.push n.text.substr n.text.length - 1
+		range.setStart n.el, i
+		range.setEnd n.el, i + 1
+	# chromium returns bogus results with getBoundingClientRect() when zero width and/or height
+	rect = range.getClientRects()
+	if rect.length > 0
+		if plus_width
+			# chromium returns multiple rects for the space that is broken
+			# across lines by word-wrap (firefox doesn't)
+			rect = rect[rect.length - 1]
 		else
-			check_i = 1
-			txts.push n.text.substr 0, i
-			txts.push n.text.substr i, 1
-			txts.push n.text.substr i + 1
-		for txt, txt_i in txts
-			el = n.el.ownerDocument.createTextNode txt
-			if txt_i is check_i
-				span = n.el.ownerDocument.createElement 'span'
-				span.appendChild el
-				el = span
-			els.push el
-			parent.insertBefore el, n.el
-		parent.removeChild n.el
-		bounds = get_el_bounds els[check_i]
-		parent.insertBefore n.el, els[0]
-		for el in els
-			parent.removeChild el
-	ret = x: bounds.x, y: bounds.y, h: bounds.h
+			rect = rect[0]
+	else
+		return x: 0, y: 0, w: 0, h: 0 # TODO return null, fix callers
+	doc = n.el.ownerDocument.documentElement
+	win = n.el.ownerDocument.defaultView
+	y_fix = win.pageYOffset - doc.clientTop
+	x_fix = win.pageXOffset - doc.clientLeft
+	ret = {
+		x: rect.left + x_fix
+		y: rect.top + y_fix
+		w: rect.width ? (rect.right - rect.left)
+		h: rect.height ? (rect.top - rect.bottom)
+	}
 	if plus_width
-		ret.x += bounds.w
-	# fudge case where bounds are BS because we're on non-significant whitespace
-	if i > 0
-		first = cursor_to_xyh n, 0
-		if ret.x <= first.x and ret.y is first.y
-			# no need for a loop here, because recursion
-			ret = cursor_to_xyh n, i - 1
+		ret.x += ret.w
+	debug_dot_at n.el.ownerDocument, ret.x, ret.y
 	return ret
 
 # encode text so it can be safely placed inside an html attribute
@@ -174,17 +165,15 @@ css +=     'height: 1em;'
 css +=     'width: 2px;'
 css +=     'margin-left: -1px;'
 css +=     'margin-right: -1px;'
-css +=     'background: #000;'
-css +=     '-webkit-animation: 1s blink step-end infinite;'
-css +=     'animation: 1s blink step-end infinite;'
+css +=     'background: #444;'
+css +=     '-webkit-animation: blink 1s steps(2, start) infinite;'
+css +=     'animation: blink 1s steps(2, start) infinite;'
 css += '}'
-css += '@-webkit-keyframes "blink" {'
-css +=     'from, to { background: #000; }'
-css +=     '50% { background: transparent; }'
+css += '@-webkit-keyframes blink {'
+css +=     'to { visibility: hidden; }'
 css += '}'
-css += '@keyframes "blink" {'
-css +=     'from, to { background: #000; }'
-css +=     '50% { background: transparent; }'
+css += '@keyframes blink {'
+css +=     'to { visibility: hidden; }'
 css += '}'
 
 # key codes:
@@ -231,7 +220,11 @@ traverse_tree = (tree, state, cb) ->
 # TODO make it so cursor can go places that don't have text but could
 find_next_cursor_position = (tree, n, i) ->
 	if n? and n.type is TYPE_TEXT and n.text.length > i
-		return [n, i + 1]
+		orig_xyh = cursor_to_xyh n, i
+		for next_i in [i+1 .. n.text.length] # inclusive is valid (after last char)
+			next_xyh = cursor_to_xyh n, next_i
+			if next_xyh.x > orig_xyh.x or next_xyh.y > orig_xyh.y
+				return [n, next_i]
 	found = traverse_tree tree, before: n?, (node, state) ->
 		if node.type is TYPE_TEXT and state.before is false
 			state.node = node
@@ -245,6 +238,11 @@ find_next_cursor_position = (tree, n, i) ->
 # TODO make it so cursor can go places that don't have text but could
 find_prev_cursor_position = (tree, n, i) ->
 	if n? and n.type is TYPE_TEXT and i > 0
+		orig_xyh = cursor_to_xyh n, i
+		for prev_i in [i-1 .. 0]
+			prev_xyh = cursor_to_xyh n, prev_i
+			if prev_xyh.x < orig_xyh.x or prev_xyh.y < orig_xyh.y
+				return [n, prev_i]
 		return [n, i - 1]
 	found = traverse_tree tree, before: n?, (node, state) ->
 		if node.type is TYPE_TEXT
@@ -280,9 +278,11 @@ find_loc_cursor_position = (tree, loc) ->
 				after_i = c.text.length
 				after = cursor_to_xyh c, after_i
 				if loc.y < before.y + before.h and loc.x < before.x
-					continue # before first char on first line
+					# console.log 'before first char on first line'
+					continue
 				if loc.y > after.y and loc.x > after.x
-					continue # after last char on last line
+					# console.log 'after last char on last line'
+					continue
 				if loc.y < before.y
 					console.log "Warning: click in bounding box but above first line"
 					continue # above first line (runaround?)
@@ -389,8 +389,18 @@ class PeachHTML5Editor
 					when KEY_END
 						return false
 					when KEY_BACKSPACE
+						return false unless @cursor?
+						return false unless @cursor[1] > 0
+						@cursor[0].text = @cursor[0].text.substr(0, @cursor[1] - 1) + @cursor[0].text.substr(@cursor[1])
+						@cursor[0].el.nodeValue = @cursor[0].text
+						@move_cursor [@cursor[0], @cursor[1] - 1]
 						return false
 					when KEY_DELETE
+						return false unless @cursor?
+						return false unless @cursor[1] < @cursor[0].text.length
+						@cursor[0].text = @cursor[0].text.substr(0, @cursor[1]) + @cursor[0].text.substr(@cursor[1] + 1)
+						@cursor[0].el.nodeValue = @cursor[0].text
+						@move_cursor [@cursor[0], @cursor[1]]
 						return false
 					when KEY_ENTER
 						return false
@@ -448,7 +458,8 @@ class PeachHTML5Editor
 		@clear_dom()
 		instantiate_tree @tree, @idoc.body
 	move_cursor: (cursor) ->
-		return if @cursor? and cursor? and @cursor[0] is cursor[0] and @cursor[1] is cursor[1]
+		loc = cursor_to_xyh cursor[0], cursor[1]
+		return if loc is null
 		@cursor = cursor
 		# replace cursor, to reset blink animation
 		if @cursor_visible
@@ -457,7 +468,6 @@ class PeachHTML5Editor
 		@idoc.body.appendChild @cursor_el
 		@cursor_visible = true
 		# TODO figure out x,y coords for cursor
-		loc = cursor_to_xyh cursor[0], cursor[1]
 		@cursor_el.style.left = "#{loc.x}px"
 		@cursor_el.style.top = "#{loc.y}px"