From: Jason Woofenden <jason@jasonwoof.com>
Date: Mon, 4 Nov 2013 01:37:55 +0000 (-0500)
Subject: Merge remote-tracking branch 'sbd/master'
X-Git-Url: https://jasonwoof.com/gitweb/?p=hexbog.git;a=commitdiff_plain;h=6efb82ed2f52b2567a7e7c5d42ff0ea4c3b3a615

Merge remote-tracking branch 'sbd/master'
---

6efb82ed2f52b2567a7e7c5d42ff0ea4c3b3a615
diff --cc main.coffee
index 00b7ae2,e19481f..ce67983
--- a/main.coffee
+++ b/main.coffee
@@@ -458,28 -411,19 +453,20 @@@ new_tile = (num, x, y) -
  	html_tile.click ->
  		me = $(this)
  		num = me.data 'tile_number'
 +		return if tiles[num].hp < 1
  		if num in selected
- 			nth_of_word = selected.indexOf(num)
- 			first = nth_of_word is 0
- 			last = nth_of_word is selected.length - 1
- 
- 			if first and last
- 				unselect_all() # Clicking only selected letter unselects it
- 			else if first and !last
- 				shrink_selection 1 # Clicking start of word goes back to just that letter
- 				# should this unselect all?
- 			else if last
+ 			if selected.length > 2 and num is selected.last()
  				activate_selection()
  			else
- 				shrink_selection nth_of_word + 1
- 		else # (not clicking on selected tile)
- 			if selected.length is 0
- 				select_tile num
- 			else
- 				unless num in board_neighbors[selected.last()]
+ 				if selected.length > 1
+ 					unselect_all()
+ 					select_tile num
+ 				else
  					unselect_all()
- 				select_tile num
+ 		else # (not clicking on selected tile)
+ 			if selected.length > 0 and not (num in board_neighbors[selected.last()])
+ 				unselect_all()
+ 			select_tile num
  
  
  $board = null