X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=editor.coffee;h=f0255069f44ade797aaf5c03d56effc47fe72b5c;hb=8e5bb6306b58c3ec1a85987e0c6326169168f774;hp=1b2503e051afcd8484f3aaf14796ef8a29a98d54;hpb=0e48ade448937b84f60cb57d13aa9851e2eb3976;p=peach-html5-editor.git

diff --git a/editor.coffee b/editor.coffee
index 1b2503e..f025506 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -665,6 +665,7 @@ class PeachHTML5Editor
 		@options = options ? {}
 		@in_el = in_el
 		@tree = null
+		@tree_parent = null # top-level nodes in @tree should have this .parent
 		@matting = []
 		@init_1_called = false # when iframes have loaded
 		@outer_iframe # iframe to hold editor
@@ -917,6 +918,9 @@ class PeachHTML5Editor
 						@move_cursor new_cursor
 				return false
 			when KEY_END
+				new_cursor = last_cursor_position @tree
+				if new_cursor?
+					@move_cursor new_cursor
 				return false
 			when KEY_BACKSPACE
 				return false unless @cursor?
@@ -943,10 +947,15 @@ class PeachHTML5Editor
 					@kill_cursor()
 				return false
 			when KEY_ENTER
+				@on_key_enter e
 				return false
 			when KEY_ESCAPE
+				@kill_cursor()
 				return false
 			when KEY_HOME
+				new_cursor = first_cursor_position @tree
+				if new_cursor?
+					@move_cursor new_cursor
 				return false
 			when KEY_INSERT
 				return false
@@ -972,6 +981,44 @@ class PeachHTML5Editor
 				console.log "ERROR: couldn't find cursor position after insert"
 				@kill_cursor()
 		return false
+	on_key_enter: (e) -> # enter key pressed
+		return unless @cursor_visible
+		cur_block = @cursor.n
+		loop
+			if cur_block.type is 'tag'
+				if is_display_block cur_block.el
+					break
+			return unless cur_block.parent?
+			cur_block = cur_block.parent
+		# find array to insert new element into
+		if cur_block.parent is @tree_parent # top-level
+			parent_el = @idoc.body
+			pc = @tree
+		else
+			parent_el = cur_block.parent.el
+			pc = cur_block.parent.children
+		# find index of current block in its parent
+		for n, i in pc
+			break if n is cur_block
+		i += 1 # we want to be after it
+		if i < pc.length
+			before = pc[i].el
+		else
+			before = null
+		# TODO if content after cursor
+		#	TODO new block is empty
+		new_text = new peach_parser.Node 'text', text: ' '
+		new_node = new peach_parser.Node 'tag', name: 'p', parent: cur_block.parent, attrs: {style: 'white-space: pre-wrap'}, children: [new_text]
+		new_text.parent = new_node
+		new_text.el = domify @idoc, text: ' '
+		new_node.el = domify @idoc, p: style: 'white-space: pre-wrap', children: [new_text.el]
+		pc.splice i, 0, new_node
+		parent_el.insertBefore new_node.el, before
+		@changed()
+		new_cursor = new_cursor_position n: new_text, i: 0
+		throw 'bork bork' unless new_cursor?
+		@move_cursor new_cursor
+		# TODO move content past cursor into this new block
 	clear_dom: -> # remove all the editable content (and cursor, overlays, etc)
 		while @idoc.body.childNodes.length
 			@idoc.body.removeChild @idoc.body.childNodes[0]
@@ -979,6 +1026,7 @@ class PeachHTML5Editor
 		return
 	load_html: (html) ->
 		@tree = peach_parser.parse html, @parser_opts
+		@tree_parent = @tree[0]?.parent
 		@clear_dom()
 		instantiate_tree @tree, @idoc.body
 		tree_dedup_space @tree
@@ -1059,15 +1107,28 @@ class PeachHTML5Editor
 				if needle is n.attrs.style.substr n.attrs.style.length - needle
 					n.attrs.style = n.attrs.style.substr 0, n.attrs.style.length - needle
 					n.el.setAttribute n.attrs.style
+	# detect special case: typing before a space that's the only thing in a block/doc
+	# reason: enter key creates blocks with just a space in them
+	insert_should_replace: (n, i) ->
+		return false unless i is 0
+		return false unless n.text is ' '
+		return true if n.parent is @tree_parent
+		if n.parent.children.length is 1
+			if n.parent.children[0] is n
+				# n is only child
+				return true
+		return false
 	# after calling this, you MUST call changed() and adjust_whitespace_style()
 	insert_character: (n, i, char) ->
+		return if @cursor.n.parent is @tree_parent # top-level text not supported atm
 		parent = @cursor.n.parent
-		return unless parent
-		return unless parent.el?
 		# insert the character
-		if i is 0
+		if @insert_should_replace n, i
+			n.text = char
+		else if i is 0
 			n.text = char + n.text
 		else if i is n.text.length
+			# replace the space
 			n.text += char
 		else
 			n.text =