X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=editor.coffee;h=494108eb22e813abcfe8fa6a50502ef911cdd8a2;hb=4499a63c976847078d309a8b6af2ecea741e296c;hp=d9b8ac531c399d26d7fd4366adda0948d021917b;hpb=a8e360112070562e780d12d52eec7ab054a1c6a5;p=peach-html5-editor.git

diff --git a/editor.coffee b/editor.coffee
index d9b8ac5..494108e 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -22,6 +22,8 @@ TYPE_TEXT = peach_parser.TYPE_TEXT
 TYPE_COMMENT = peach_parser.TYPE_COMMENT
 TYPE_DOCTYPE = peach_parser.TYPE_DOCTYPE
 
+timeout = (ms, cb) -> return setTimeout cb, ms
+
 debug_dot_at = (doc, x, y) ->
 	return # disabled
 	el = doc.createElement 'div'
@@ -56,6 +58,19 @@ is_display_block = (el) ->
 	else
 		return window.getComputedStyle(el, null).getPropertyValue('display') is 'block'
 
+# pass a node (not an element) for a tag
+# returns if this is the sort of tag that cares about leading/trailing whitespace
+# FIXME this probably doesn't work all the time
+is_whitespace_significant = (n) ->
+	if n.name is 'textarea'
+		return true
+	if n.name is 'pre'
+		return true
+	if n.el.currentStyle?
+		return n.el.currentStyle['white-space'].substr(0, 3) is 'pre'
+	else
+		return window.getComputedStyle(n.el, null).getPropertyValue('white-space').substr(0, 3) is 'pre'
+
 # Pass return value from dom event handlers to this.
 # If they return false, this will addinionally stop propagation and default.
 event_return = (e, bool) ->
@@ -139,6 +154,15 @@ void_elements = {
 	track: true
 	wbr: true
 }
+# TODO make these always pretty-print (on the inside) like blocks
+no_text_elements = { # these elements never contain text
+	select: true
+	table: true
+	tr: true
+	thead: true
+	tbody: true
+}
+# FIXME terminology: s/dom/tree/; s/el/n/
 dom_to_html = (dom, indent = '', parent_is_block = false) ->
 	ret = ''
 	for el, i in dom
@@ -147,10 +171,13 @@ dom_to_html = (dom, indent = '', parent_is_block = false) ->
 				is_block = is_display_block el.el
 				if is_block
 					is_tiny_block = false
-					if el.children.length is 1
-						if el.children[0].type is TYPE_TEXT
-							if el.children[0].text.length < 35
-								is_tiny_block = true
+					if is_whitespace_significant el
+						is_tiny_block = true
+					else
+						if el.children.length is 1
+							if el.children[0].type is TYPE_TEXT
+								if el.children[0].text.length < 35
+									is_tiny_block = true
 				if is_block or (parent_is_block and i is 0)
 					ret += indent
 				ret += '<' + el.name
@@ -475,7 +502,6 @@ tree_remove_empty_text_nodes = (tree) ->
 			if n.text.length is 0
 				empties.unshift n
 		return false
-	console.log empties
 	for n in empties
 		# don't completely empty the tree
 		if tree.length is 1
@@ -483,11 +509,9 @@ tree_remove_empty_text_nodes = (tree) ->
 				console.log "oop, leaving a blank node because it's the only thing"
 				return
 		n.el.parentNode.removeChild n.el
-		console.log 'removing'
 		for c, i in n.parent.children
 			if c is n
 				n.parent.children.splice i, 1
-				console.log 'removed'
 				break
 
 # pass a array of nodes (from parser library, ie it should have .el and .text)
@@ -787,7 +811,6 @@ class PeachHTML5Editor
 		tree_dedup_space @tree
 		@changed()
 	changed: ->
-		# FIXME don't export cursor placeholder (when cursor is between space characters)
 		@in_el.onchange = null
 		@in_el.value = dom_to_html @tree
 		@in_el.onchange = =>
@@ -805,13 +828,12 @@ class PeachHTML5Editor
 			console.log "error: tried to move cursor to position that has no pixel location", cursor[0], cursor[1]
 			return
 		@cursor = cursor
-		# replace cursor, to reset blink animation
+		# replace cursor element, to reset blink animation
 		if @cursor_visible
 			@cursor_el.parentNode.removeChild @cursor_el
 		@cursor_el = domify @outer_idoc, div: id: 'cursor'
 		@overlay.appendChild @cursor_el
 		@cursor_visible = true
-		# TODO figure out x,y coords for cursor
 		@cursor_el.style.left = "#{loc.x + overlay_padding - 1}px"
 		@cursor_el.style.top = "#{loc.y + overlay_padding}px"