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

diff --git a/editor.coffee b/editor.coffee
index 494108e..6fa48cb 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -163,61 +163,61 @@ no_text_elements = { # these elements never contain text
 	tbody: true
 }
 # FIXME terminology: s/dom/tree/; s/el/n/
-dom_to_html = (dom, indent = '', parent_is_block = false) ->
+tree_to_html = (tree, indent = '', parent_is_block = false) ->
 	ret = ''
-	for el, i in dom
-		switch el.type
+	for n, i in tree
+		switch n.type
 			when TYPE_TAG
-				is_block = is_display_block el.el
+				is_block = is_display_block n.el
 				if is_block
 					is_tiny_block = false
-					if is_whitespace_significant el
+					if is_whitespace_significant n
 						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
+						if n.children.length is 1
+							if n.children[0].type is TYPE_TEXT
+								if n.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
+				ret += '<' + n.name
 				attr_keys = []
-				for k of el.attrs
+				for k of n.attrs
 					attr_keys.unshift k
 				#attr_keys.sort()
 				for k in attr_keys
 					ret += " #{k}"
-					if el.attrs[k].length > 0
-						ret += "=\"#{enc_attr el.attrs[k]}\""
+					if n.attrs[k].length > 0
+						ret += "=\"#{enc_attr n.attrs[k]}\""
 				ret += '>'
-				unless void_elements[el.name]?
+				unless void_elements[n.name]?
 					if is_block
 						next_indent = indent + '    '
 					else
 						next_indent = indent
-					if el.children.length
+					if n.children.length
 						if is_block and not is_tiny_block
 							ret += "\n"
-						ret += dom_to_html el.children, next_indent, is_block and not is_tiny_block
+						ret += tree_to_html n.children, next_indent, is_block and not is_tiny_block
 						if is_block and not is_tiny_block
 							ret += indent
-					ret += "</#{el.name}>"
-				if is_block or (parent_is_block and i is dom.length - 1)
+					ret += "</#{n.name}>"
+				if is_block or (parent_is_block and i is tree.length - 1)
 					ret += "\n"
 			when TYPE_TEXT
 				if parent_is_block and i is 0
 					ret += indent
-				ret += enc_text el.text
-				if parent_is_block and i is dom.length - 1
+				ret += enc_text n.text
+				if parent_is_block and i is tree.length - 1
 					ret += "\n"
 			when TYPE_COMMENT
-				ret += "<!--#{el.text}-->"
+				ret += "<!--#{n.text}-->"
 			when TYPE_DOCTYPE
-				ret += "<!DOCTYPE #{el.name}"
-				if el.public_identifier? and el.public_identifier.length > 0
-					ret += " \"#{el.public_identifier}\""
-				if el.system_identifier? and el.system_identifier.length > 0
-					ret += " \"#{el.system_identifier}\""
+				ret += "<!DOCTYPE #{n.name}"
+				if n.public_identifier? and n.public_identifier.length > 0
+					ret += " \"#{n.public_identifier}\""
+				if n.system_identifier? and n.system_identifier.length > 0
+					ret += " \"#{n.system_identifier}\""
 				ret += ">\n"
 	return ret
 
@@ -636,14 +636,17 @@ class PeachHTML5Editor
 		@options = options ? {}
 		@in_el = in_el
 		@tree = []
+		@matting = []
 		@inited = false # when iframes have loaded
 		@outer_iframe # iframe to hold editor
 		@outer_idoc # "document" object for @outer_iframe
+		@wrap2 = null # scrollbar is on this
 		@iframe = null # iframe to hold editable content
 		@idoc = null # "document" object for @iframe
 		@cursor = null
 		@cursor_el = null
 		@cursor_visible = false
+		@iframe_offset = null
 		opt_fragment = @options.fragment ? true
 		@parser_opts = {}
 		if opt_fragment
@@ -665,7 +668,7 @@ class PeachHTML5Editor
 			setTimeout (=> @init() unless @inited), 200 # firefox never fires this onload
 			@outer_idoc.body.appendChild(
 				domify @outer_idoc, div: id: 'wrap1', children: [
-					domify @outer_idoc, div: id: 'wrap2', children: [
+					@wrap2 = domify @outer_idoc, div: id: 'wrap2', children: [
 						domify @outer_idoc, div: id: 'wrap3', children: [
 							@iframe
 							@overlay = domify @outer_idoc, div: id: 'overlay'
@@ -687,15 +690,15 @@ class PeachHTML5Editor
 	init: -> # called by @iframe's onload (or timeout on firefox)
 		@idoc = @iframe.contentDocument
 		@overlay.onclick = (e) =>
-			return event_return @onclick e
+			return event_return e, @onclick e
 		@overlay.ondoubleclick = (e) =>
-			return event_return @ondoubleclick e
+			return event_return e, @ondoubleclick e
 		@outer_idoc.body.onkeyup = (e) =>
-			return event_return @onkeyup e
+			return event_return e, @onkeyup e
 		@outer_idoc.body.onkeydown = (e) =>
-			return event_return @onkeydown e
+			return event_return e, @onkeydown e
 		@outer_idoc.body.onkeypress = (e) =>
-			return event_return @onkeypress e
+			return event_return e, @onkeypress e
 		if @options.stylesheet
 			# TODO test this
 			@idoc.head.appendChild domify @idoc, style: src: @options.stylesheet
@@ -703,10 +706,16 @@ class PeachHTML5Editor
 		@inited = true
 		if @options.on_init?
 			@options.on_init()
+	overlay_event_to_inner_xy: (e) ->
+		unless @iframe_offset?
+			@iframe_offset = get_el_bounds @iframe
+		x = e.pageX # TODO ?cross-browserify
+		y = e.pageY + @wrap2.scrollTop # TODO ?cross-browserify
+		# TODO adjust for scrolling
+		return x: x - @iframe_offset.x, y: y - @iframe_offset.y
 	onclick: (e) ->
-		x = (e.offsetX ? e.layerX) - overlay_padding
-		y = (e.offsetY ? e.layerY) - overlay_padding
-		new_cursor = find_loc_cursor_position @tree, x: x, y: y
+		xy = @overlay_event_to_inner_xy e
+		new_cursor = find_loc_cursor_position @tree, xy
 		if new_cursor?
 			@move_cursor new_cursor
 		return false
@@ -757,6 +766,7 @@ class PeachHTML5Editor
 				@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]
+				@changed()
 				return false
 			when KEY_DELETE
 				return false unless @cursor?
@@ -764,6 +774,7 @@ class PeachHTML5Editor
 				@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]]
+				@changed()
 				return false
 			when KEY_ENTER
 				return false
@@ -812,7 +823,7 @@ class PeachHTML5Editor
 		@changed()
 	changed: ->
 		@in_el.onchange = null
-		@in_el.value = dom_to_html @tree
+		@in_el.value = tree_to_html @tree
 		@in_el.onchange = =>
 			@load_html @in_el.value
 		@iframe.style.height = "0"
@@ -822,6 +833,7 @@ class PeachHTML5Editor
 			@cursor_el.parentNode.removeChild @cursor_el
 			@cursor_visible = false
 		@cursor = null
+		@matt null
 	move_cursor: (cursor) ->
 		loc = cursor_to_xyh cursor[0], cursor[1]
 		unless loc?
@@ -836,6 +848,31 @@ class PeachHTML5Editor
 		@cursor_visible = true
 		@cursor_el.style.left = "#{loc.x + overlay_padding - 1}px"
 		@cursor_el.style.top = "#{loc.y + overlay_padding}px"
+		@matt cursor[0]
+	matt: (n) ->
+		while @matting.length > 0
+			@overlay.removeChild @matting[0]
+			@matting.shift()
+		return unless n?
+		prev_bounds = x: 0, y: 0, w: 0, h: 0
+		alpha = 0.1
+		while n?.el?
+			if n.type is TYPE_TEXT
+				n = n.parent
+				continue
+			bounds = get_el_bounds n.el
+			return unless bounds?
+			if bounds.x is prev_bounds.x and bounds.y is prev_bounds.y and bounds.w is prev_bounds.w and bounds.h is prev_bounds.h
+				n = n.parent
+				continue
+			matt = domify @outer_idoc, div: style: "position: absolute; left: #{bounds.x - 1 + overlay_padding}px; top: #{bounds.y - 1 + overlay_padding}px; width: #{bounds.w}px; height: #{bounds.h}px; outline: 1000px solid rgba(0,153,255,#{alpha}); border: 1px solid rgba(0,0,0,.1)"
+			@overlay.appendChild matt
+			@matting.push matt
+			ann = domify @outer_idoc, div: style: "position: absolute; left: #{bounds.x - 2 + overlay_padding}px; top: #{bounds.y - 6 + overlay_padding}px; font-size: 8px", children: [domify @outer_idoc, text: "<#{n.name}>"]
+			@overlay.appendChild ann
+			@matting.push ann
+			n = n.parent
+			alpha *= 1.5
 
 window.peach_html5_editor = (args...) ->
 	return new PeachHTML5Editor args...