X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=editor.coffee;h=a9d0a3c95d352931672379cbb953bc8fd6b155de;hb=b3b872ef2a2200cd1e674845f0215341c1e67bfd;hp=6a9d36175fb9c2376c5babf9aabee657b50faa2a;hpb=63ce3e05b1e43795223331ee68d6b8257e3b134e;p=peach-html5-editor.git

diff --git a/editor.coffee b/editor.coffee
index 6a9d361..a9d0a3c 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -17,12 +17,30 @@
 # SETTINGS
 overlay_padding = 10
 
-TYPE_TAG = peach_parser.TYPE_TAG
-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
+next_frame = (cb) ->
+	if (window.requestAnimationFrame?)
+		window.requestAnimationFrame cb
+	else
+		timeout 16, cb
+
+this_url_sans_path = ->
+	ret = "#{window.location.href}"
+	clip = ret.lastIndexOf '#'
+	if clip > -1
+		ret = ret.substr 0, clip
+	clip = ret.lastIndexOf '?'
+	if clip > -1
+		ret = ret.substr 0, clip
+	clip = ret.lastIndexOf '/'
+	if clip > -1
+		ret = ret.substr 0, clip + 1
+	return ret
+
+# xml 1.0 spec, chromium and firefox accept these, plus lots of unicode chars
+valid_attr_regex = new RegExp '^[a-zA-Z_:][-a-zA-Z0-9_:.]*$'
+# html5 spec is much more lax, but chromium won't let me make at attribute with the name "4"
+js_attr_regex = new RegExp '^[oO][nN].'
 
 debug_dot_at = (doc, x, y) ->
 	return # disabled
@@ -179,6 +197,8 @@ outer_css = (args) ->
 	ret += 'body {'
 	ret +=     'margin: 0;'
 	ret +=     'padding: 0;'
+	ret +=     'color: black;'
+	ret +=     'background: white;'
 	ret += '}'
 	ret += '#wrap1 {'
 	ret +=     "border: #{occupy 1}px solid black;"
@@ -224,21 +244,48 @@ outer_css = (args) ->
 	ret += '}'
 	ret += '#cursor {'
 	ret +=     'position: absolute;'
-	ret +=     'height: 1em;' # FIXME adjust for hight of text
 	ret +=     'width: 2px;'
-	ret +=     'background: #444;'
-	ret +=     '-webkit-animation: blink 1s steps(2, start) infinite;'
-	ret +=     'animation: blink 1s steps(2, start) infinite;'
+	ret +=     'background: linear-gradient(0deg, rgba(0,0,0,1), rgba(255,255,255,1), rgba(0,0,0,1), rgba(255,255,255,1), rgba(0,0,0,1), rgba(255,255,255,1), rgba(0,0,0,1), rgba(255,255,255,1), rgba(0,0,0,1));'
+	ret +=     'background-size: 200% 200%;'
+	ret +=     '-webkit-animation: blink 1s linear normal infinite;'
+	ret +=     'animation: blink 1s linear normal infinite;'
 	ret += '}'
 	ret += '@-webkit-keyframes blink {'
-	ret +=     'to { visibility: hidden; }'
+	ret +=     '0%{background-position:0% 0%}'
+	ret +=     '100%{background-position:0% -100%}'
 	ret += '}'
-	ret += '@keyframes blink {'
-	ret +=     'to { visibility: hidden; }'
+	ret += '@keyframes blink { '
+	ret +=     '0%{background-position:0% 0%}'
+	ret +=     '100%{background-position:0% -100%}'
+	ret += '}'
+	ret += '.ann_box {'
+	ret +=     'z-index: 5;'
+	ret +=     'position: absolute;'
+	ret +=     'border: 1px solid rgba(0,0,0,0.1);'
+	ret +=     'outline: 1px solid rgba(255,255,255,0.1);' # in case there's a black background
+	ret += '}'
+	ret += '.ann_tag {'
+	ret +=     'z-index: 10;'
+	ret +=     'position: absolute;'
+	ret +=     'font-size: 8px;'
+	ret +=     'white-space: pre;'
+	ret +=     'background: rgba(255,255,255,0.4);'
+	ret +=     '-ms-user-select: none;'
+	ret +=     '-webkit-user-select: none;'
+	ret +=     '-moz-user-select: none;'
+	ret +=     'user-select: none;'
 	ret += '}'
 	return ret
 
-# key codes:
+
+ignore_key_codes =
+	'18': true # alt
+	'20': true # capslock
+	'17': true # ctrl
+	'144': true # numlock
+	'16': true # shift
+	'91': true # windows "start" key
+# key codes: (valid on keydown, not keypress)
 KEY_LEFT = 37
 KEY_UP = 38
 KEY_RIGHT = 39
@@ -253,14 +300,6 @@ KEY_INSERT = 45
 KEY_PAGE_UP = 33
 KEY_PAGE_DOWN = 34
 KEY_TAB = 9
-
-ignore_key_codes =
-	'18': true # alt
-	'20': true # capslock
-	'17': true # ctrl
-	'144': true # numlock
-	'16': true # shift
-	'91': true # windows "start" key
 control_key_codes = # we react to these, but they aren't typing
 	'37': KEY_LEFT
 	'38': KEY_UP
@@ -281,18 +320,21 @@ instantiate_tree = (tree, parent) ->
 	remove = []
 	for c, i in tree
 		switch c.type
-			when TYPE_TEXT
+			when 'text'
 				c.el = parent.ownerDocument.createTextNode c.text
 				parent.appendChild c.el
-			when TYPE_TAG
+			when 'tag'
 				if c.name in ['script', 'object', 'iframe', 'link']
 					# TODO put placeholders instead
 					remove.unshift i
+					continue
 				# TODO create in correct namespace
 				c.el = parent.ownerDocument.createElement c.name
 				for k, v of c.attrs
 					# FIXME if attr_whitelist[k]?
-					c.el.setAttribute k, v
+					if valid_attr_regex.test k
+						unless js_attr_regex.test k
+							c.el.setAttribute k, v
 				parent.appendChild c.el
 				if c.children.length
 					instantiate_tree c.children, c.el
@@ -310,7 +352,7 @@ traverse_tree = (tree, cb) ->
 	return done
 
 find_next_cursor_position = (tree, n, i) ->
-	if n.type is TYPE_TEXT and n.text.length > i
+	if n.type is 'text' and n.text.length > i
 		orig_xyh = cursor_to_xyh n, i
 		unless orig_xyh?
 			console.log "ERROR: couldn't find xy for current cursor location"
@@ -323,7 +365,7 @@ find_next_cursor_position = (tree, n, i) ->
 	state_before = true
 	found = null
 	traverse_tree tree, (node, state) ->
-		if node.type is TYPE_TEXT and state_before is false
+		if node.type is 'text' and state_before is false
 			if cursor_to_xyh(node, 0)?
 				found = node
 				return true
@@ -335,7 +377,7 @@ find_next_cursor_position = (tree, n, i) ->
 	return null
 
 find_prev_cursor_position = (tree, n, i) ->
-	if n? and n.type is TYPE_TEXT and i > 0
+	if n? and n.type is 'text' and i > 0
 		orig_xyh = cursor_to_xyh n, i
 		unless orig_xyh?
 			console.log "ERROR: couldn't find xy for current cursor location"
@@ -349,7 +391,7 @@ find_prev_cursor_position = (tree, n, i) ->
 	found_prev = n?
 	found = null
 	traverse_tree tree, (node) ->
-		if node.type is TYPE_TEXT
+		if node.type is 'text'
 			if node is n
 				if found_prev?
 					found = found_prev
@@ -364,7 +406,7 @@ find_prev_cursor_position = (tree, n, i) ->
 
 find_loc_cursor_position = (tree, loc) ->
 	for c in tree
-		if c.type is TYPE_TAG or c.type is TYPE_TEXT
+		if c.type is 'tag' or c.type is 'text'
 			bounds = get_el_bounds c.el
 			continue if loc.x < bounds.x
 			continue if loc.x > bounds.x + bounds.w
@@ -373,7 +415,7 @@ find_loc_cursor_position = (tree, loc) ->
 			if c.children.length
 				ret = find_loc_cursor_position c.children, loc
 				return ret if ret?
-			if c.type is TYPE_TEXT
+			if c.type is 'text'
 				# click is within bounding box that contains all text.
 				return [c, 0] if c.text.length is 0
 				before_i = 0
@@ -429,14 +471,14 @@ is_space = (chr) ->
 tree_remove_empty_text_nodes = (tree) ->
 	empties = []
 	traverse_tree tree, (n) ->
-		if n.type is TYPE_TEXT
+		if n.type is 'text'
 			if n.text.length is 0
 				empties.unshift n
 		return false
 	for n in empties
 		# don't completely empty the tree
 		if tree.length is 1
-			if tree[0].type is TYPE_TEXT
+			if tree[0].type is 'text'
 				console.log "oop, leaving a blank node because it's the only thing"
 				return
 		n.el.parentNode.removeChild n.el
@@ -458,13 +500,13 @@ tree_dedup_space = (tree) ->
 
 	iterate = (tree, cb) ->
 		for n in tree
-			if n.type is TYPE_TEXT
+			if n.type is 'text'
 				i = 0
 				while i < n.text.length # don't foreach, cb might remove chars
 					advance = cb n, i
 					if advance
 						i += 1
-			if n.type is TYPE_TAG
+			if n.type is 'tag'
 				block = is_display_block n.el
 				if block
 					cb null
@@ -562,13 +604,14 @@ tree_dedup_space = (tree) ->
 class PeachHTML5Editor
 	# Options: (all optional)
 	#   editor_id: "id" attribute for outer-most element created by/for editor
+	#   css_file: filename of a css file to style editable content
 	#   on_init: callback for when the editable content is in place
 	constructor: (in_el, options) ->
 		@options = options ? {}
 		@in_el = in_el
-		@tree = []
+		@tree = null
 		@matting = []
-		@inited = false # when iframes have loaded
+		@init_1_called = false # when iframes have loaded
 		@outer_iframe # iframe to hold editor
 		@outer_idoc # "document" object for @outer_iframe
 		@wrap2 = null # scrollbar is on this
@@ -577,7 +620,9 @@ class PeachHTML5Editor
 		@cursor = null
 		@cursor_el = null
 		@cursor_visible = false
+		@poll_for_blur_timeout = null
 		@iframe_offset = null
+		@iframe_height = null
 		opt_fragment = @options.fragment ? true
 		@parser_opts = {}
 		if opt_fragment
@@ -593,12 +638,14 @@ class PeachHTML5Editor
 				domify @outer_idoc, text: css
 			]
 			@outer_idoc.head.appendChild icss
-			@iframe = domify @outer_idoc, iframe: {}
+			@iframe = domify @outer_idoc, iframe: sandbox: 'allow-same-origin allow-scripts'
 			@iframe.onload = =>
-				@init()
-			setTimeout (=> @init() unless @inited), 200 # firefox never fires this onload
+				@init_1()
+			timeout 200, => # firefox never fires this onload
+				@init_1() unless @init_1_called
 			@outer_idoc.body.appendChild(
 				domify @outer_idoc, div: id: 'wrap1', children: [
+					domify @outer_idoc, div: style: "position: absolute; top: 0; left: 1px; font-size: 10px", children: [ domify @outer_idoc, text: "Peach HTML5 Editor" ]
 					@wrap2 = domify @outer_idoc, div: id: 'wrap2', children: [
 						domify @outer_idoc, div: id: 'wrap3', children: [
 							@iframe
@@ -618,23 +665,39 @@ class PeachHTML5Editor
 		@outer_iframe.setAttribute 'style', outer_iframe_style
 		css = outer_css w: outer_bounds.w, h: outer_bounds.h
 		outer_wrap.appendChild @outer_iframe
-	init: -> # called by @iframe's onload (or timeout on firefox)
+	init_1: -> # @iframe has loaded (but not it's css)
 		@idoc = @iframe.contentDocument
+		@init_1_called = true
+		# chromium doesn't resolve relative urls as though they were at the same domain
+		# so add a <base> tag
+		@idoc.head.appendChild domify @idoc, base: href: this_url_sans_path()
+		# don't let @iframe have scrollbars
+		@idoc.head.appendChild domify @idoc, style: children: [domify @idoc, text: "body { overflow: hidden; }"]
+		# load css file
+		if @options.css_file
+			istyle = domify @idoc, link: rel: 'stylesheet', href: @options.css_file
+			istyle.onload = =>
+				@init_2()
+			@idoc.head.appendChild istyle
+		else
+			@init_2()
+	init_2: -> # @iframe and it's css file(s) are ready
 		@overlay.onclick = (e) =>
+			@have_focus()
 			return event_return e, @onclick e
 		@overlay.ondoubleclick = (e) =>
+			@have_focus()
 			return event_return e, @ondoubleclick e
 		@outer_idoc.body.onkeyup = (e) =>
+			@have_focus()
 			return event_return e, @onkeyup e
 		@outer_idoc.body.onkeydown = (e) =>
+			@have_focus()
 			return event_return e, @onkeydown e
 		@outer_idoc.body.onkeypress = (e) =>
+			@have_focus()
 			return event_return e, @onkeypress e
-		if @options.stylesheet
-			# TODO test this
-			@idoc.head.appendChild domify @idoc, style: src: @options.stylesheet
 		@load_html @in_el.value
-		@inited = true
 		if @options.on_init?
 			@options.on_init()
 	overlay_event_to_inner_xy: (e) ->
@@ -649,6 +712,8 @@ class PeachHTML5Editor
 		new_cursor = find_loc_cursor_position @tree, xy
 		if new_cursor?
 			@move_cursor new_cursor
+		else
+			@kill_cursor()
 		return false
 	ondoubleclick: (e) ->
 		return false
@@ -724,7 +789,7 @@ class PeachHTML5Editor
 	onkeypress: (e) ->
 		return if e.ctrlKey
 		return false if ignore_key_codes[e.keyCode]?
-		return false if control_key_codes[e.keyCode]? # handled in keydown
+		# return false if control_key_codes[e.keyCode]? # handled in keydown
 		char = e.charCode ? e.keyCode
 		if char and @cursor?
 			char = String.fromCharCode char
@@ -757,8 +822,15 @@ class PeachHTML5Editor
 		@in_el.value = @pretty_html @tree
 		@in_el.onchange = =>
 			@load_html @in_el.value
-		@iframe.style.height = "0"
-		@iframe.style.height = "#{@idoc.body.scrollHeight}px"
+		@adjust_iframe_height()
+	adjust_iframe_height: ->
+		h = parseInt(@idoc.body.scrollHeight, 10)
+		if @iframe_height isnt h
+			@iframe_height = h
+			s = @wrap2.scrollTop
+			@iframe.style.height = "0"
+			@iframe.style.height = "#{h}px"
+			@wrap2.scrollTop = s
 	kill_cursor: -> # remove it, forget where it was
 		if @cursor_visible
 			@cursor_el.parentNode.removeChild @cursor_el
@@ -778,7 +850,12 @@ class PeachHTML5Editor
 		@overlay.appendChild @cursor_el
 		@cursor_visible = true
 		@cursor_el.style.left = "#{loc.x + overlay_padding - 1}px"
-		@cursor_el.style.top = "#{loc.y + overlay_padding}px"
+		if loc.h < 5
+			height = 12
+		else
+			height = loc.h
+		@cursor_el.style.top = "#{loc.y + overlay_padding + Math.round(height * .07)}px"
+		@cursor_el.style.height = "#{Math.round height * 0.82}px"
 		@matt cursor[0]
 	matt: (n) ->
 		while @matting.length > 0
@@ -788,7 +865,7 @@ class PeachHTML5Editor
 		prev_bounds = x: 0, y: 0, w: 0, h: 0
 		alpha = 0.1
 		while n?.el?
-			if n.type is TYPE_TEXT
+			if n.type is 'text'
 				n = n.parent
 				continue
 			bounds = get_el_bounds n.el
@@ -796,10 +873,10 @@ class PeachHTML5Editor
 			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)"
+			matt = domify @outer_idoc, div: class: 'ann_box', style: "left: #{bounds.x - 1 + overlay_padding}px; top: #{bounds.y - 2 + overlay_padding}px; width: #{bounds.w}px; height: #{bounds.h}px" # outline: 1000px solid rgba(0,153,255,#{alpha});
 			@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}>"]
+			ann = domify @outer_idoc, div: class: 'ann_tag', style: "left: #{bounds.x + 1 + overlay_padding}px; top: #{bounds.y - 7 + overlay_padding}px", children: [domify @outer_idoc, text: " #{n.name} "]
 			@overlay.appendChild ann
 			@matting.push ann
 			n = n.parent
@@ -814,7 +891,7 @@ class PeachHTML5Editor
 			inner_flags = want_nl: true
 			is_br = false
 			switch n.type
-				when TYPE_TAG
+				when 'tag'
 					if n.name is 'br'
 						is_br = true
 					is_text = false
@@ -824,12 +901,14 @@ class PeachHTML5Editor
 						display = cs['display']
 						position = cs['position']
 						float = cs['float']
+						visibility = cs['visibility']
 					else
 						cs = @iframe.contentWindow.getComputedStyle(n.el, null)
 						whitespace = cs.getPropertyValue 'white-space'
 						display = cs.getPropertyValue 'display'
 						position = cs.getPropertyValue 'position'
 						float = cs.getPropertyValue 'float'
+						visibility = cs.getPropertyValue 'visibility'
 					if n.name is 'textarea'
 						inner_flags.pre_ish = true
 					else
@@ -845,7 +924,11 @@ class PeachHTML5Editor
 									if 'display' is 'none'
 										in_flow = false
 									else
-										in_flow = true
+										switch visibility
+											when 'hidden', 'collapse'
+												in_flow = false
+											else # visible
+												in_flow = true
 					switch display
 						when 'inline', 'none'
 							inner_flags.block = false
@@ -857,12 +940,12 @@ class PeachHTML5Editor
 							inner_flags.block = true
 							is_block = true
 							in_flow_block = in_flow
-				when TYPE_TEXT
+				when 'text'
 					is_text = true
 					is_block = false
 					in_flow = true
 					in_flow_block = false
-				else # TYPE_COMMENT, TYPE_DOCTYPE
+				else # 'comment', 'doctype'
 					is_text = false
 					is_block = false
 					in_flow = false
@@ -875,7 +958,7 @@ class PeachHTML5Editor
 							ret += "\n"
 						ret += indent
 			switch n.type
-				when TYPE_TAG
+				when 'tag'
 					ret += '<' + n.name
 					attr_keys = []
 					for k of n.attrs
@@ -894,11 +977,11 @@ class PeachHTML5Editor
 						if n.children.length
 							ret += @pretty_html n.children, next_indent, inner_flags
 						ret += "</#{n.name}>"
-				when TYPE_TEXT
+				when 'text'
 					ret += enc_text n.text
-				when TYPE_COMMENT
+				when 'comment'
 					ret += "<!--#{n.text}-->" # TODO encode?
-				when TYPE_DOCTYPE
+				when 'doctype'
 					ret += "<!DOCTYPE #{n.name}"
 					if n.public_identifier? and n.public_identifier.length > 0
 						ret += " \"#{n.public_identifier}\""
@@ -915,6 +998,21 @@ class PeachHTML5Editor
 				if prev_in_flow_is_block or parent_flags.block
 					ret += "\n#{indent.substr 4}"
 		return ret
+	onblur: ->
+		@kill_cursor()
+	have_focus: ->
+		@editor_is_focused = true
+		@poll_for_blur()
+	poll_for_blur: ->
+		return if @poll_for_blur_timeout? # already polling
+		@poll_for_blur_timeout = timeout 150, =>
+			next_frame => # pause polling when browser knows we're not active/visible/etc.
+				@poll_for_blur_timeout = null
+				if document.activeElement is @outer_iframe
+					@poll_for_blur()
+				else
+					@editor_is_focused = false
+					@onblur()
 
 window.peach_html5_editor = (args...) ->
 	return new PeachHTML5Editor args...