X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=editor.coffee;h=07bf2c760f7ae919a96c067abf9410a76ba608d9;hb=0644f17def6ee0e7b5cc3b6972bfdf279f6d5f15;hp=c3f35be30439e9b084cc0a061b2daeeb91228d0e;hpb=6c22b1995a894c76fd54349f978a36fd09960bc9;p=peach-html5-editor.git

diff --git a/editor.coffee b/editor.coffee
index c3f35be..07bf2c7 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -56,6 +56,15 @@ is_display_block = (el) ->
 	else
 		return window.getComputedStyle(el, null).getPropertyValue('display') is 'block'
 
+# Pass return value from dom event handlers to this.
+# If they return false, this will addinionally stop propagation and default.
+event_return = (e, bool) ->
+	if bool is false
+		if e.stopPropagation?
+			e.stopPropagation()
+		if e.preventDefault?
+			e.preventDefault()
+	return bool
 # Warning: currently assumes you're asking about a single character
 # Note: chromium returns multiple bounding rects for a space at a line-break
 # Note: chromium's getBoundingClientRect() is broken (when zero-area client rects)
@@ -89,7 +98,7 @@ 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
-	if i is n.text.length
+	else if i is n.text.length
 		ret = text_range_bounds n.el, i - 1, i
 		if ret?
 			ret.x += ret.w
@@ -181,25 +190,32 @@ outer_css = (args) ->
 	inner_padding = args.inner_padding ? overlay_padding
 	frame_width = args.frame_width ? inner_padding
 	# TODO editor controls height...
-	shrink = (px) ->
-		w -= 2 * px
-		h -= 2 * px
-		return px
+	occupy = (left, top = left, right = left, bottom = top) ->
+		w -= left + right
+		h -= top + bottom
+		return Math.max(left, top, right, bottom)
 	ret = ''
 	ret += 'body {'
 	ret +=     'margin: 0;'
 	ret +=     'padding: 0;'
 	ret += '}'
 	ret += '#wrap1 {'
-	ret +=     "border: #{shrink 1}px solid black;"
-	ret +=     "padding: #{shrink frame_width}px;"
+	ret +=     "border: #{occupy 1}px solid black;"
+	ret +=     "padding: #{occupy frame_width}px;"
 	ret += '}'
 	ret += '#wrap2 {'
-	ret +=     "border: #{shrink 1}px solid black;"
-	ret +=     "padding: #{shrink inner_padding}px;"
+	ret +=     "border: #{occupy 1}px solid black;"
+	ret +=     "padding: #{occupy inner_padding}px;"
+	ret +=     "padding-right: #{inner_padding + occupy 0, 0, 15, 0}px;" # for scroll bar
+	ret +=     "width: #{w}px;"
+	ret +=     "height: #{h}px;"
+	ret +=     'overflow-x: hidden;'
+	ret +=     'overflow-y: scroll;'
 	ret += '}'
 	ret += '#wrap3 {'
 	ret +=     'position: relative;'
+	ret +=     "width: #{w}px;"
+	ret +=     "min-height: #{h}px;"
 	ret += '}'
 	ret += 'iframe {'
 	ret +=     'box-sizing: border-box;'
@@ -207,7 +223,11 @@ outer_css = (args) ->
 	ret +=     'border: none;'
 	ret +=     'padding: 0;'
 	ret +=     "width: #{w}px;"
-	ret +=     "height: #{h}px;"
+	#ret +=     "height: #{h}px;" # height auto-set when content set/changed
+	ret +=     '-ms-user-select: none;'
+	ret +=     '-webkit-user-select: none;'
+	ret +=     '-moz-user-select: none;'
+	ret +=     'user-select: none;'
 	ret += '}'
 	ret += '#overlay {'
 	ret +=     'position: absolute;'
@@ -306,8 +326,7 @@ traverse_tree = (tree, state, cb) ->
 			traverse_tree c.children, state, cb
 			break if state.done?
 	return state
-# find the next element in tree (and decendants) that is after n and can contain text
-# TODO make it so cursor can go places that don't have text but could
+
 find_next_cursor_position = (tree, n, i) ->
 	if n? and n.type is TYPE_TEXT and n.text.length > i
 		orig_xyh = cursor_to_xyh n, i
@@ -321,15 +340,15 @@ find_next_cursor_position = (tree, n, i) ->
 					return [n, next_i]
 	found = traverse_tree tree, before: n?, (node, state) ->
 		if node.type is TYPE_TEXT and state.before is false
-			state.node = node
-			state.done = true
+			if cursor_to_xyh(node, 0)?
+				state.node = node
+				state.done = true
 		if node is n
 			state.before = false
 	if found.node?
 		return [found.node, 0]
 	return null
 
-# TODO make it so cursor can go places that don't have text but could
 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
@@ -354,7 +373,12 @@ find_prev_cursor_position = (tree, n, i) ->
 			if node
 				state.prev = node
 	if found.node?
-		return [found.node, found.node.text.length]
+		ret = [found.node, found.node.text.length]
+		# check for unusual case: text not visible
+		loc = cursor_to_xyh ret[0], ret[1]
+		if loc?
+			return ret
+		return find_prev_cursor_position tree, ret[0], 0
 	return null
 
 find_loc_cursor_position = (tree, loc) ->
@@ -542,11 +566,12 @@ tree_dedup_space = (tree) ->
 class PeachHTML5Editor
 	# Options: (all optional)
 	#   editor_id: "id" attribute for outer-most element created by/for editor
+	#   on_init: callback for when the editable content is in place
 	constructor: (in_el, options) ->
 		@options = options ? {}
 		@in_el = in_el
 		@tree = []
-		@initialized = false # when iframes have loaded
+		@inited = false # when iframes have loaded
 		@outer_iframe # iframe to hold editor
 		@outer_idoc # "document" object for @outer_iframe
 		@iframe = null # iframe to hold editable content
@@ -572,7 +597,7 @@ class PeachHTML5Editor
 			@iframe = domify @outer_idoc, iframe: {}
 			@iframe.onload = =>
 				@init()
-			setTimeout (=> @init()), 200 # firefox never fires this onload
+			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: [
@@ -595,29 +620,33 @@ class PeachHTML5Editor
 		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)
-		return if @initialized # ignore timeout for non-broken browsers
 		@idoc = @iframe.contentDocument
 		@overlay.onclick = (e) =>
-			return @onclick e
+			return event_return @onclick e
+		@overlay.ondoubleclick = (e) =>
+			return event_return @ondoubleclick e
 		@outer_idoc.body.onkeyup = (e) =>
-			return @onkeyup e
+			return event_return @onkeyup e
 		@outer_idoc.body.onkeydown = (e) =>
-			return @onkeydown e
+			return event_return @onkeydown e
 		@outer_idoc.body.onkeypress = (e) =>
-			return @onkeypress e
+			return event_return @onkeypress e
 		if @options.stylesheet
 			# TODO test this
 			@idoc.head.appendChild domify @idoc, style: src: @options.stylesheet
 		@load_html @in_el.value
-		@initialized = true
-		if @options.initialized_cb?
-			@options.initialized_cb()
+		@inited = true
+		if @options.on_init?
+			@options.on_init()
 	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
 		if new_cursor?
 			@move_cursor new_cursor
+		return false
+	ondoubleclick: (e) ->
+		return false
 	onkeyup: (e) ->
 		return if e.ctrlKey
 		return false if ignore_key_codes[e.keyCode]?