X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=editor.coffee;h=863d1ff4d55ab6dd44f0d0741199b7c2d2f0a24c;hb=54109efd9bd5514190c6854b345f091c4d496563;hp=cde553db83bca03289c18244355c7661be58bbbe;hpb=6130a51115ea0181baf6ca0f286ca5f845bbeff3;p=peach-html5-editor.git

diff --git a/editor.coffee b/editor.coffee
index cde553d..863d1ff 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -19,13 +19,17 @@ TYPE_TEXT = peach_parser.TYPE_TEXT
 TYPE_COMMENT = peach_parser.TYPE_COMMENT
 TYPE_DOCTYPE = peach_parser.TYPE_DOCTYPE
 
-get_el_offset = (el) ->
+get_el_bounds = (el) ->
 	rect = el.getBoundingClientRect()
 	doc = el.ownerDocument.documentElement
 	win = el.ownerDocument.defaultView
+	y_fix = win.pageYOffset - doc.clientTop
+	x_fix = win.pageXOffset - doc.clientLeft
 	return {
-		top: rect.top + win.pageYOffset - doc.clientTop
-		left: rect.left + win.pageXOffset - doc.clientLeft
+		x: rect.left + x_fix
+		y: rect.top + y_fix
+		w: rect.width ? (rect.right - rect.left)
+		h: rect.height ? (rect.top - rect.bottom)
 	}
 
 # figure out the top/left coordinates of where the cursor should be if it's at
@@ -34,39 +38,54 @@ get_el_offset = (el) ->
 # implementation: insert a span tag where we want the cursor, and ask the
 # browser where it put that span
 cursor_to_loc = (n, i) ->
-	span = domify span: style: "height: 1em; width: 0", children: [domify text: "|"]
+	span = domify span: style: "height: 1em; border-left: 1px solid black; margin-left: -1px"
 	parent = n.el.parentNode
-	if i is 0
-		# cursor at start of text
-		parent.insertBefore span, n.el
-		ret = get_el_offset span
-		span.parentNode.removeChild span
-		return ret
-	else if i is n.text.length
-		# cursor at end of text
-		parent.insertBefore span, n.el.nextSibling
-		ret = get_el_offset span
-		span.parentNode.removeChild span
-		return ret
-	# cursor in middle of text
-	# split the text node
-	t0 = n.el.ownerDocument.createTextNode n.text.substr 0, i
-	t1 = n.el.ownerDocument.createTextNode n.text.substr i
-	parent.insertBefore t0, n.el
-	parent.insertBefore span, n.el
-	parent.insertBefore t1, n.el
-	parent.removeChild n.el
-	ret = get_el_offset span
-	parent.insertBefore n.el, t0
-	parent.removeChild t0
-	parent.removeChild span
-	parent.removeChild t1
+	els = []
+	txts = []
+	plus_width = false
+	if n.text.length < 2
+		bounds = get_el_offset n.el
+		if i is 1
+			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
+		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 = top: bounds.y, left: bounds.x
+	if plus_width
+		ret.left += bounds.w
+	# fudge case where bounds are BS because we're on non-significant whitespace
+	if i > 0
+		first = cursor_to_loc n, 0
+		if ret.left <= first.left
+			# no need for a loop here, because recursion
+			ret = cursor_to_loc n, i - 1
 	return ret
 
-# TODO
-#loc_to_cursor = (n, i) ->
-#	return top: , left:
-
 # encode text so it can be safely placed inside an html attribute
 enc_attr_regex = new RegExp '(&)|(")|(\u00A0)', 'g'
 enc_attr = (txt) ->
@@ -199,10 +218,10 @@ traverse_tree = (tree, state, cb) ->
 	return state
 # find the next element in top (and decendants) that is after n and can contain text
 # TODO make it so cursor can go places that don't have text but could
-find_next_cursor_position = (top, n, i) ->
+find_next_cursor_position = (tree, n, i) ->
 	if n? and n.type is TYPE_TEXT and n.text.length > i
 		return [n, i + 1]
-	found = traverse_tree top, before: n?, (node, state) ->
+	found = traverse_tree tree, before: n?, (node, state) ->
 		if node.type is TYPE_TEXT and state.before is false
 			state.node = node
 			state.done = true
@@ -213,10 +232,10 @@ find_next_cursor_position = (top, n, i) ->
 	return null
 
 # TODO make it so cursor can go places that don't have text but could
-find_prev_cursor_position = (top, n, i) ->
+find_prev_cursor_position = (tree, n, i) ->
 	if n? and n.type is TYPE_TEXT and i > 0
 		return [n, i - 1]
-	found = traverse_tree top, before: n?, (node, state) ->
+	found = traverse_tree tree, before: n?, (node, state) ->
 		if node.type is TYPE_TEXT
 			unless n?
 				state.node = node
@@ -231,6 +250,27 @@ find_prev_cursor_position = (top, n, i) ->
 		return [found.node, found.node.text.length]
 	return null
 
+find_loc_cursor_position = (tree, loc) ->
+	console.log tree, loc
+	for c in tree
+		if c.type is TYPE_TAG or c.type is TYPE_TEXT
+			# FIXME get_el_bounds doesn't work on TYPE_TEXT
+			bounds = get_el_bounds c.el
+			console.log bounds
+			continue if loc.left < bounds.x
+			continue if loc.left > bounds.x + bounds.w
+			continue if loc.top < bounds.y
+			continue if loc.top > bounds.y + bounds.h
+			if c.type is TYPE_TEXT
+				# FIXME find position, don't just pass 0
+				return [c, 0]
+			if c.children.length
+				console.log "in"
+				ret = find_loc_cursor_position c.children, loc
+				console.log 'found', ret if ret?
+				return ret if ret?
+	return null
+
 class PeachHTML5Editor
 	constructor: (in_el, options = {}) ->
 		@in_el = in_el
@@ -270,6 +310,11 @@ class PeachHTML5Editor
 				'34': KEY_PAGE_DOWN
 				'9':  KEY_TAB
 
+			@idoc.body.onclick = (e) =>
+				# idoc.body.offset().left/top
+				new_cursor = find_loc_cursor_position @tree, left: e.pageX, top: e.pageY
+				if new_cursor?
+					@move_cursor new_cursor
 			@idoc.body.onkeyup = (e) =>
 				return if e.ctrlKey
 				return false if ignore_key_codes[e.keyCode]?