X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.coffee;h=1700d1085a2955edb51536d045f815e4bcc565a3;hb=af3c698f6904444dad37f7f581b69994396b4f7d;hp=12fb70da826a2dd7cc7fb1da9b1d4b6d8d48c8a5;hpb=6f6384594cea325b2b141576af1fd683a9adadb4;p=hexbog.git

diff --git a/main.coffee b/main.coffee
index 12fb70d..1700d10 100644
--- a/main.coffee
+++ b/main.coffee
@@ -339,17 +339,21 @@ blip_selection = ->
 activate_selection = ->
 	word = selected_word()
 	if word.length < 3
+		# FIXME make this a hint
 		log "Too short: \"#{word}\""
 		return
 	unless is_word word
+		# FIXME make this automatically part of the selection display
 		log "Not on word list: \"#{word}\""
 		return
-	score += Math.round(Math.pow(1.7, word.length))
+	word_score = Math.round(Math.pow(1.7, word.length))
+	score += word_score
 	$score_display.html score
-	log "blipped: #{word}"
+	# FIXME make some kind of animation showing score gain
+	log "blipped \"#{word}\" for #{word_score} points"
 	blip_selection()
 	look_up_definition word
-	$('#definition').click() if cur_tab is 'instructions'
+	$('#definition').click()
 
 
 show_definition = (word, type, definition, language) ->
@@ -520,6 +524,7 @@ extract_wiktionary_definiton = (html) ->
 
 
 look_up_definition = (word) ->
+	$definition_body.html "Looking up definition for \"#{word}\"."
 	$.ajax({
 		url: "http://en.wiktionary.org/w/api.php?action=parse&format=json&page=#{word}"
 		jsonpCallback: "lud_#{word}" # always use the same callback for the same word so it's cacheable
@@ -531,9 +536,7 @@ look_up_definition = (word) ->
 				if tdl
 					show_definition word, tdl[0], tdl[1], tdl[2]
 			else
-				log "Sorry, couldn't find a definition for \"#{word}\""
-		error: ->
-			log "wiktionary failed to load: \"#{error_msg}\""
+				$definition_body.html "Sorry, couldn't find a definition for \"#{word}\"."
 	})
 
 board_as_txt = ->
@@ -573,20 +576,28 @@ init_tab = (t) ->
 		$('#' + t).removeClass('tab').addClass('selected-tab').animate({height: tab_height}, 1000)
 		cur_tab = t
 init_tabs = ->
-	for t in ['instructions', 'definition', 'logtab', 'restart']
+	for t in ['instructions', 'definition', 'donate', 'restart']
 		init_tab t
 
+init_keybinding = ->
+	$(window).keydown (e) ->
+		switch e.keyCode
+			when 32, 10, 13
+				activate_selection()
+			when 27
+				unselect_all()
+
 $log = undefined
 init_log = ->
 	$log = $('#log')
 log = (msg) ->
-	$log.children().last().remove()
-	$log.prepend $('<div></div>').html msg
+	console.log msg if console.log?
 
 init_game = ->
 	init_log()
 	if $(window).height() >= 440
 		$('#centerer').css('margin-top', '25px')
+	init_keybinding()
 	init_tabs()
 	init_board()
 	init_html_board()