X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=editor.coffee;h=411072ae98ffa8f990da860e527bc8e2f9b0947e;hb=847c7fc3eccf3cc66bfd19e49b9753c194b15cf3;hp=0a023966681c6f41007be3e38be6cb2a692b4cd1;hpb=d78c8fb078ffe27653da73aaf9800cc0b8228fc1;p=peach-html5-editor.git

diff --git a/editor.coffee b/editor.coffee
index 0a02396..411072a 100644
--- a/editor.coffee
+++ b/editor.coffee
@@ -388,13 +388,15 @@ find_prev_cursor_position = (tree, n, i) ->
 				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?
+	found_prev = null
 	found = null
 	traverse_tree tree, (node) ->
 		if node.type is 'text'
+			unless n?
+				found = node
+				return true
 			if node is n
-				if found_prev?
-					found = found_prev
+				found = found_prev # null if n is the first text node
 				return true
 			found_prev = node
 		return false
@@ -609,9 +611,9 @@ class PeachHTML5Editor
 	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
@@ -640,8 +642,9 @@ class PeachHTML5Editor
 			@outer_idoc.head.appendChild icss
 			@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" ]
@@ -664,8 +667,23 @@ 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
@@ -681,17 +699,7 @@ class PeachHTML5Editor
 		@outer_idoc.body.onkeypress = (e) =>
 			@have_focus()
 			return event_return e, @onkeypress e
-		# 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()
-		if @options.css_file
-			istyle = domify @idoc, link: rel: 'stylesheet', type: 'text/css', href: @options.css_file + '?foo=baz'
-			istyle.onload = =>
-				@adjust_iframe_height()
-			@idoc.head.appendChild istyle
-		@idoc.head.appendChild domify @idoc, style: children: [domify @idoc, text: "body { overflow: hidden; }"]
 		@load_html @in_el.value
-		@inited = true
 		if @options.on_init?
 			@options.on_init()
 	overlay_event_to_inner_xy: (e) ->
@@ -733,6 +741,27 @@ class PeachHTML5Editor
 							break
 				return false
 			when KEY_UP
+				if @cursor?
+					new_cursor = @cursor
+					old_loc = cursor_to_xyh new_cursor[0], new_cursor[1]
+					new_loc = x: old_loc.x, y: old_loc.y
+					while new_loc.y >= old_loc.y
+						new_cursor = find_prev_cursor_position @tree, new_cursor[0], new_cursor[1]
+						return false unless new_cursor?
+						new_loc = cursor_to_xyh new_cursor[0], new_cursor[1]
+					if new_cursor?
+						# now we're above
+						if new_loc.x > old_loc.x
+							console.log 'fixme'
+							# TODO move left until we go up or meet/pass old_loc.x
+							# then set new_cursor to the closest
+						@move_cursor new_cursor
+				else
+					# move cursor to first position in document
+					new_cursor = find_prev_cursor_position @tree
+					if new_cursor?
+						@move_cursor new_cursor
+						break
 				return false
 			when KEY_RIGHT
 				if @cursor?
@@ -740,11 +769,11 @@ class PeachHTML5Editor
 					if new_cursor?
 						@move_cursor new_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 = find_prev_cursor_position @tree
+					if new_cursor?
+						@move_cursor new_cursor
+						break
 				return false
 			when KEY_DOWN
 				return false