JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
code cleanup: var/func renames
[peach-html5-editor.git] / editor.coffee
index c70ebbe..a932f16 100644 (file)
 # 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
@@ -31,7 +51,7 @@ debug_dot_at = (doc, x, y) ->
 
 # text nodes don't have getBoundingClientRect(), so use selection api to find
 # it.
-get_el_bounds = (el) ->
+get_el_bounds = window.bounds = (el) ->
        if el.getBoundingClientRect?
                rect = el.getBoundingClientRect()
        else
@@ -91,22 +111,42 @@ text_range_bounds = (el, start, end) ->
                bounding: range.getBoundingClientRect()
        }
 
-# figure out the x/y coordinates of where the cursor should be if it's at
-# position ``i`` within text node ``n``
-# sometimes returns null (eg for whitespace that is not visible)
-window.cursor_to_xyh = cursor_to_xyh = (n, i) ->
-       range = document.createRange()
-       if n.text.length is 0
-               ret = text_range_bounds n.el, 0, 0
-       else if i is n.text.length
-               ret = text_range_bounds n.el, i - 1, i
+class CursorPosition
+       constructor: (args) ->
+               @n = args.n ? null
+               @i = args.i ? null
+               if args.x?
+                       @x = args.x
+                       @y = args.y
+                       @h = args.h
+               else
+                       @set_xyh()
+               return
+       set_xyh: ->
+               range = document.createRange()
+               if @n.text.length is 0
+                       ret = text_range_bounds @n.el, 0, 0
+               else if @i is @n.text.length
+                       ret = text_range_bounds @n.el, @i - 1, @i
+                       if ret?
+                               ret.x += ret.w
+               else
+                       ret = text_range_bounds @n.el, @i, @i + 1
                if ret?
-                       ret.x += ret.w
-       else
-               ret = text_range_bounds n.el, i, i + 1
-       if ret?
-               debug_dot_at n.el.ownerDocument, ret.x, ret.y
-       return ret
+                       @x = ret.x
+                       @y = ret.y
+                       @h = ret.h
+               else
+                       @x = null
+                       @y = null
+                       @h = null
+               return ret
+
+new_cursor_position = (args) ->
+       ret = new CursorPosition args
+       if ret.x?
+               return ret
+       return null
 
 # encode text so it can be safely placed inside an html attribute
 enc_attr_regex = new RegExp '(&)|(")|(\u00A0)', 'g'
@@ -139,37 +179,16 @@ void_elements = {
        track: true
        wbr: true
 }
-dom_to_html = (dom) ->
-       ret = ''
-       for el in dom
-               switch el.type
-                       when TYPE_TAG
-                               ret += '<' + el.name
-                               attr_keys = []
-                               for k of el.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]}\""
-                               ret += '>'
-                               unless void_elements[el.name]
-                                       if el.children.length
-                                               ret += dom_to_html el.children
-                                       ret += "</#{el.name}>"
-                       when TYPE_TEXT
-                               ret += enc_text el.text
-                       when TYPE_COMMENT
-                               ret += "<!--#{el.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 += ">\n"
-       return ret
+# 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
+       ul: true
+       ol: true
+}
 
 domify = (doc, hash) ->
        for tag, attrs of hash
@@ -198,6 +217,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;"
@@ -243,21 +264,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 +=     '0%{background-position:0% 0%}'
+       ret +=     '100%{background-position:0% -100%}'
        ret += '}'
-       ret += '@keyframes blink {'
-       ret +=     'to { visibility: hidden; }'
+       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
@@ -272,14 +320,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
@@ -300,18 +340,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
@@ -328,112 +371,117 @@ traverse_tree = (tree, cb) ->
                        return done if done
        return done
 
-find_next_cursor_position = (tree, n, i) ->
-       if n.type is TYPE_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"
-                       return
-               for next_i in [i+1 .. n.text.length] # inclusive is valid (after last char)
-                       next_xyh = cursor_to_xyh n, next_i
-                       if next_xyh?
-                               if next_xyh.x > orig_xyh.x or next_xyh.y > orig_xyh.y
-                                       return [n, next_i]
+first_cursor_position = (tree) ->
+       found = null
+       traverse_tree tree, (node, state) ->
+               if node.type is 'text'
+                       cursor = new_cursor_position n: node, i: 0
+                       if cursor?
+                               found = cursor
+                               return true
+               return false
+       return found # maybe null
+
+# this will fail when text has non-locatable cursor positions
+find_next_cursor_position = (tree, cursor) ->
+       if cursor.n.type is 'text' and cursor.n.text.length > cursor.i
+               new_cursor = new_cursor_position n: cursor.n, i: cursor.i + 1
+               if new_cursor?
+                       return new_cursor
        state_before = true
        found = null
        traverse_tree tree, (node, state) ->
-               if node.type is TYPE_TEXT and state_before is false
-                       if cursor_to_xyh(node, 0)?
-                               found = node
+               if node.type is 'text' and state_before is false
+                       new_cursor = new_cursor_position n: node, i: 0
+                       if new_cursor?
+                               found = new_cursor
                                return true
-               if node is n
+               if node is cursor.n
                        state_before = false
                return false
        if found?
-               return [found, 0]
+               return found
        return null
 
-find_prev_cursor_position = (tree, n, i) ->
-       if n? and n.type is TYPE_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"
-                       return
-               for prev_i in [i-1 .. 0]
-                       prev_xyh = cursor_to_xyh n, prev_i
-                       if prev_xyh?
-                               if prev_xyh.x < orig_xyh.x or prev_xyh.y < orig_xyh.y
-                                       return [n, prev_i]
-               return [n, i - 1]
-       found_prev = n?
+last_cursor_position = (tree) ->
        found = null
        traverse_tree tree, (node) ->
-               if node.type is TYPE_TEXT
-                       if node is n
-                               if found_prev?
-                                       found = found_prev
-                               return true
-                       found_prev = node
+               if node.type is 'text'
+                       cursor = new_cursor_position n: node, i: node.text.length
+                       if cursor?
+                               found = cursor
                return false
-       if found?
-               if cursor_to_xyh found, found.text.length # text visible?
-                       return [found, found.text.length]
-               return find_prev_cursor_position tree, ret[0], 0
-       return null
+       return found # maybe null
 
-find_loc_cursor_position = (tree, loc) ->
-       for c in tree
-               if c.type is TYPE_TAG or c.type is TYPE_TEXT
-                       bounds = get_el_bounds c.el
-                       continue if loc.x < bounds.x
-                       continue if loc.x > bounds.x + bounds.w
-                       continue if loc.y < bounds.y
-                       continue if loc.y > bounds.y + bounds.h
-                       if c.children.length
-                               ret = find_loc_cursor_position c.children, loc
+# this will fail when text has non-locatable cursor positions
+find_prev_cursor_position = (tree, cursor) ->
+       if cursor.n.type is 'text' and cursor.i > 0
+               new_cursor = new_cursor_position n: cursor.n, i: cursor.i - 1
+               if new_cursor?
+                       return new_cursor
+       found_prev = null
+       found = null
+       traverse_tree tree, (node) ->
+               if node is cursor.n
+                       found = found_prev # maybe null
+                       return true
+               if node.type is 'text'
+                       new_cursor = new_cursor_position n: node, i: node.text.length
+                       if new_cursor?
+                               found_prev = new_cursor
+               return false
+       return found # maybe null
+
+xy_to_cursor = (tree, xy) ->
+       for n in tree
+               if n.type is 'tag' or n.type is 'text'
+                       bounds = get_el_bounds n.el
+                       continue if xy.x < bounds.x
+                       continue if xy.x > bounds.x + bounds.w
+                       continue if xy.y < bounds.y
+                       continue if xy.y > bounds.y + bounds.h
+                       if n.children.length
+                               ret = xy_to_cursor n.children, xy
                                return ret if ret?
-                       if c.type is TYPE_TEXT
+                       if n.type is 'text'
                                # click is within bounding box that contains all text.
-                               return [c, 0] if c.text.length is 0
-                               before_i = 0
-                               before = cursor_to_xyh c, before_i
-                               unless before?
-                                       console.log "error: failed to find cursor pixel location for start of", c
-                                       return
-                               after_i = c.text.length
-                               after = cursor_to_xyh c, after_i
-                               unless after?
-                                       console.log "error: failed to find cursor pixel location for end of", c
-                                       return
-                               if loc.y < before.y + before.h and loc.x < before.x
+                               if n.text.length is 0
+                                       ret = new_cursor_position n: n, i: 0
+                                       return ret if ret?
+                                       continue
+                               before = new_cursor_position n: n, i: 0
+                               continue unless before?
+                               after = new_cursor_position n: n, i: n.text.length
+                               continue unless after?
+                               if xy.y < before.y + before.h and xy.x < before.x
                                        # console.log 'before first char on first line'
                                        continue
-                               if loc.y > after.y and loc.x > after.x
+                               if xy.y > after.y and xy.x > after.x
                                        # console.log 'after last char on last line'
                                        continue
-                               if loc.y < before.y
-                                       console.log "Warning: click in bounding box but above first line"
+                               if xy.y < before.y
+                                       console.log "Warning: click in text bounding box but above first line"
                                        continue # above first line (runaround?)
-                               if loc.y > after.y + after.h
-                                       console.log "Warning: click in bounding box but below last line", loc.y, after.y, after.h
+                               if xy.y > after.y + after.h
+                                       console.log "Warning: click in text bounding box but below last line", xy.y, after.y, after.h
                                        continue # below last line (shouldn't happen?)
-                               while after_i - before_i > 1
-                                       cur_i = Math.round((before_i + after_i) / 2)
-                                       cur = cursor_to_xyh c, cur_i
-                                       unless loc?
-                                               console.log "error: failed to find cursor pixel location for", c, cur_i
-                                               return
-                                       if loc.y < cur.y or (loc.y <= cur.y + cur.h and loc.x < cur.x)
-                                               after_i = cur_i
+                               while after.i - before.i > 1
+                                       guess_i = Math.round((before.i + after.i) / 2)
+                                       cur = new_cursor_position n: n, i: guess_i
+                                       unless cur?
+                                               console.log "error: failed to find cursor pixel location for", n, guess_i
+                                               before = null
+                                               break
+                                       if xy.y < cur.y or (xy.y <= cur.y + cur.h and xy.x < cur.x)
                                                after = cur
                                        else
-                                               before_i = cur_i
                                                before = cur
+                               continue unless before? # signals failure to find a cursor position
                                # which one is closest?
-                               if Math.abs(before.x - loc.x) < Math.abs(after.x - loc.x)
-                                       return [c, before_i]
+                               if Math.abs(before.x - xy.x) < Math.abs(after.x - xy.x)
+                                       return before
                                else
-                                       return [c, after_i]
+                                       return after
        return null
 
 # browsers collapse these (html5 spec calls these "space characters")
@@ -448,23 +496,20 @@ 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
-       console.log empties
        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
-               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)
@@ -480,13 +525,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
@@ -531,22 +576,22 @@ tree_dedup_space = (tree) ->
                #
                # remove it from the dom, and if prev or next moves, put it back.
                if prev? and not prev_px?
-                       prev_px = cursor_to_xyh prev, prev_i
+                       prev_px = new_cursor_position n: prev, i: prev_i
                if next? and not next_px?
-                       next_px = cursor_to_xyh next, next_i
+                       next_px = new_cursor_position n: next, i: next_i
                #if prev is null and next is null
                #       parent_px = cur.parent.el.getBoundingClientRect()
                remove()
                if prev?
                        if prev_px?
-                               new_prev_px = cursor_to_xyh prev, prev_i
+                               new_prev_px = new_cursor_position n: prev, i: prev_i
                                if new_prev_px.x isnt prev_px.x or new_prev_px.y isnt prev_px.y
                                        return put_it_back()
                        else
                                console.log "this shouldn't happen, we remove spaces that don't locate"
                if next?
                        if next_px?
-                               new_next_px = cursor_to_xyh next, next_i
+                               new_next_px = new_cursor_position n: next, i: next_i
                                if new_next_px.x isnt next_px.x or new_next_px.y isnt next_px.y
                                        return put_it_back()
                        #else
@@ -584,19 +629,25 @@ 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 = []
-               @inited = false # when iframes have loaded
+               @tree = null
+               @matting = []
+               @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
                @iframe = null # iframe to hold editable content
                @idoc = null # "document" object for @iframe
                @cursor = null
                @cursor_el = null
                @cursor_visible = false
+               @poll_for_blur_timeout = null
+               @wrap2_offset = null
+               @iframe_height = null
                opt_fragment = @options.fragment ? true
                @parser_opts = {}
                if opt_fragment
@@ -612,13 +663,15 @@ 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: id: 'wrap2', 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
                                                        @overlay = domify @outer_idoc, div: id: 'overlay'
@@ -637,31 +690,54 @@ 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) =>
-                       return event_return @onclick e
+                       @have_focus()
+                       return event_return e, @onclick e
                @overlay.ondoubleclick = (e) =>
-                       return event_return @ondoubleclick e
+                       @have_focus()
+                       return event_return e, @ondoubleclick e
                @outer_idoc.body.onkeyup = (e) =>
-                       return event_return @onkeyup e
+                       @have_focus()
+                       return event_return e, @onkeyup e
                @outer_idoc.body.onkeydown = (e) =>
-                       return event_return @onkeydown e
+                       @have_focus()
+                       return event_return e, @onkeydown e
                @outer_idoc.body.onkeypress = (e) =>
-                       return event_return @onkeypress e
-               if @options.stylesheet
-                       # TODO test this
-                       @idoc.head.appendChild domify @idoc, style: src: @options.stylesheet
+                       @have_focus()
+                       return event_return e, @onkeypress e
                @load_html @in_el.value
-               @inited = true
                if @options.on_init?
                        @options.on_init()
+       overlay_event_to_inner_xy: (e) ->
+               unless @wrap2_offset?
+                       @wrap2_offset = get_el_bounds @wrap2
+               x = e.pageX - overlay_padding
+               y = e.pageY - overlay_padding + @wrap2.scrollTop
+               return x: x - @wrap2_offset.x, y: y - @wrap2_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 = xy_to_cursor @tree, xy
                if new_cursor?
                        @move_cursor new_cursor
+               else
+                       @kill_cursor()
                return false
        ondoubleclick: (e) ->
                return false
@@ -676,29 +752,58 @@ class PeachHTML5Editor
                switch e.keyCode
                        when KEY_LEFT
                                if @cursor?
-                                       new_cursor = find_prev_cursor_position @tree, @cursor...
-                                       if new_cursor?
-                                               @move_cursor new_cursor
+                                       new_cursor = find_prev_cursor_position @tree, @cursor
                                else
-                                       for c in @tree
-                                               new_cursor = find_next_cursor_position @tree, c, -1
-                                               if new_cursor?
-                                                       @move_cursor new_cursor
-                                                       break
-                               return false
-                       when KEY_UP
+                                       new_cursor = first_cursor_position @tree
+                               if new_cursor?
+                                       @move_cursor new_cursor
                                return false
                        when KEY_RIGHT
                                if @cursor?
-                                       new_cursor = find_next_cursor_position @tree, @cursor...
-                                       if new_cursor?
+                                       new_cursor = find_next_cursor_position @tree, @cursor
+                               else
+                                       new_cursor = last_cursor_position @tree
+                               if new_cursor?
+                                       @move_cursor new_cursor
+                               return false
+                       when KEY_UP
+                               if @cursor?
+                                       new_cursor = @cursor
+                                       # go prev until we're higher on y axis
+                                       while new_cursor.y >= @cursor.y
+                                               new_cursor = find_prev_cursor_position @tree, new_cursor
+                                               return false unless new_cursor?
+                                       # done early if we're already left of old cursor position
+                                       if new_cursor.x <= @cursor.x
                                                @move_cursor new_cursor
+                                               return false
+                                       target_y = new_cursor.y
+                                       # search leftward, until we find the closest position
+                                       # new_cursor is the prev-most position we've checked
+                                       # prev_cursor is the older value, so it's not as prev as new_cursor
+                                       while new_cursor.x > @cursor.x and new_cursor.y is target_y
+                                               prev_cursor = new_cursor
+                                               new_cursor = find_prev_cursor_position @tree, new_cursor
+                                               break unless new_cursor?
+                                       # move cursor to prev_cursor or new_cursor
+                                       if new_cursor?
+                                               if new_cursor.y is target_y
+                                                       # both valid, and on the same line, use closest
+                                                       if (@cursor.x - new_cursor.x) < (prev_cursor.x - @cursor.x)
+                                                               @move_cursor new_cursor
+                                                       else
+                                                               @move_cursor prev_cursor
+                                               else
+                                                       # new_cursor on wrong line, use prev_cursor
+                                                       @move_cursor prev_cursor
+                                       else
+                                               # can't go any further prev, use prev_cursor
+                                               @move_cursor prev_cursor
                                else
-                                       for c in @tree
-                                               new_cursor = find_prev_cursor_position @tree, c, -1
-                                               if new_cursor?
-                                                       @move_cursor new_cursor
-                                                       break
+                                       # move cursor to first position in document
+                                       new_cursor = first_cursor_position @tree
+                                       if new_cursor?
+                                               @move_cursor new_cursor
                                return false
                        when KEY_DOWN
                                return false
@@ -710,6 +815,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?
@@ -717,6 +823,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
@@ -735,7 +842,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
@@ -764,33 +871,195 @@ 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.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
                        @cursor_visible = false
                @cursor = null
+               @annotate null
        move_cursor: (cursor) ->
-               loc = cursor_to_xyh cursor[0], cursor[1]
-               unless loc?
-                       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
-               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"
+               unless @cursor_visible
+                       @cursor_el = domify @outer_idoc, div: id: 'cursor'
+                       @overlay.appendChild @cursor_el
+                       @cursor_visible = true
+               @cursor_el.style.left = "#{cursor.x + overlay_padding - 1}px"
+               if cursor.h < 5
+                       height = 12
+               else
+                       height = cursor.h
+               @cursor_el.style.top = "#{cursor.y + overlay_padding + Math.round(height * .07)}px"
+               @cursor_el.style.height = "#{Math.round height * 0.82}px"
+               @annotate cursor.n
+       annotate: (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 '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
+                       ann_box = 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 ann_box
+                       @matting.push ann_box
+                       ann_tag = 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_tag
+                       @matting.push ann_tag
+                       n = n.parent
+                       alpha *= 1.5
+       pretty_html: (tree, indent = '', parent_flags = pre_ish: false, block: true, want_nl: false) ->
+               ret = ''
+               want_nl = parent_flags.want_nl
+               prev_in_flow_is_text = false
+               prev_in_flow_is_block = false
+               for n, i in tree
+                       # figure out flags
+                       inner_flags = want_nl: true
+                       is_br = false
+                       switch n.type
+                               when 'tag'
+                                       if n.name is 'br'
+                                               is_br = true
+                                       is_text = false
+                                       if n.el.currentStyle?
+                                               cs = n.el.currentStyle
+                                               whitespace = cs['white-space']
+                                               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
+                                               inner_flags.pre_ish = whitespace.substr(0, 3) is 'pre'
+                                       switch float
+                                               when 'left', 'right'
+                                                       in_flow = false
+                                               else
+                                                       switch position
+                                                               when 'absolute', 'fixed'
+                                                                       in_flow = false
+                                                               else
+                                                                       if 'display' is 'none'
+                                                                               in_flow = false
+                                                                       else
+                                                                               switch visibility
+                                                                                       when 'hidden', 'collapse'
+                                                                                               in_flow = false
+                                                                                       else # visible
+                                                                                               in_flow = true
+                                       switch display
+                                               when 'inline', 'none'
+                                                       inner_flags.block = false
+                                                       is_block = in_flow_block = false
+                                               when 'inline-black'
+                                                       inner_flags.block = true
+                                                       is_block = in_flow_block = false
+                                               else # block, table, etc
+                                                       inner_flags.block = true
+                                                       is_block = true
+                                                       in_flow_block = in_flow
+                               when 'text'
+                                       is_text = true
+                                       is_block = false
+                                       in_flow = true
+                                       in_flow_block = false
+                               else # 'comment', 'doctype'
+                                       is_text = false
+                                       is_block = false
+                                       in_flow = false
+                                       in_flow_block = false
+                       # print whitespace if we can
+                       unless parent_flags.pre_ish
+                               unless prev_in_flow_is_text and is_br
+                                       if (i is 0 and parent_flags.block) or in_flow_block or prev_in_flow_is_block
+                                               if want_nl
+                                                       ret += "\n"
+                                               ret += indent
+                       switch n.type
+                               when 'tag'
+                                       ret += '<' + n.name
+                                       attr_keys = []
+                                       for k of n.attrs
+                                               attr_keys.unshift k
+                                       #attr_keys.sort()
+                                       for k in attr_keys
+                                               ret += " #{k}"
+                                               if n.attrs[k].length > 0
+                                                       ret += "=\"#{enc_attr n.attrs[k]}\""
+                                       ret += '>'
+                                       unless void_elements[n.name]?
+                                               if inner_flags.block
+                                                       next_indent = indent + '    '
+                                               else
+                                                       next_indent = indent
+                                               if n.children.length
+                                                       ret += @pretty_html n.children, next_indent, inner_flags
+                                               ret += "</#{n.name}>"
+                               when 'text'
+                                       ret += enc_text n.text
+                               when 'comment'
+                                       ret += "<!--#{n.text}-->" # TODO encode?
+                               when 'doctype'
+                                       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 += ">"
+                       want_nl = true
+                       if in_flow
+                               prev_in_flow_is_text = is_text
+                               prev_in_flow_is_block = is_block or (in_flow and is_br)
+               if tree.length
+                       # output final newline if allowed
+                       unless parent_flags.pre_ish
+                               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...