use https

[hexbog.git] / main.coffee

diff --git a/main.coffee b/main.coffee
index 147b76a..7daeab5 100644 (file)
--- a/main.coffee
+++ b/main.coffee
@@ -306,7 +306,7 @@ update_selection_display = ->
                                else
                                        last = ''
                                $little_tip.html "Click the #{last}\"#{word.substr(word.length - 1)}\" for #{score_for word} points"
-                               $big_tip.html "<a href=\"http://en.wiktionary.org/wiki/#{word}\" target=\"_blank\" title=\"click for definition\">#{word}</a>"
+                               $big_tip.html "<a href=\"https://en.wiktionary.org/wiki/#{word}\" target=\"_blank\" title=\"click for definition\">#{word}</a>"
                                $big_tip.addClass('good')
                        else
                                $big_tip.html word
@@ -548,7 +548,11 @@ blip_selection = ->
                        force = effects.force.last()
                if force > 0
                        for tile in area.up
-                               tile.new_hp = tile.hp + force
+                               if tile.new_hp
+                                       # for overlap of board and [n]neigbors
+                                       tile.new_hp += force
+                               else
+                                       tile.new_hp = tile.hp + force
        for s in spaces
                s.tile.new_hp ?= s.tile.hp - 1
                if s.tile.new_hp < 0
@@ -622,36 +626,36 @@ activate_selection = ->
 
 
 show_definition = (word, type, definition, language) ->
-       html = "<a href=\"http://en.wiktionary.org/wiki/#{word}\" target=\"_blank\">"
+       html = "<a href=\"https://en.wiktionary.org/wiki/#{word}\" target=\"_blank\">"
        html += "#{word.substr(0, 1).toUpperCase() + word.substr(1)}</a>, #{type}"
        if language isnt 'English'
                html += " (#{language})"
        html += ': '
        html += definition
-       html += '<div id="definition_credit">Definition &copy;<a href="http://en.wiktionary.org/" target="_blank">wiktionary.org</a> CC-BY-SA</div>'
+       html += '<div id="definition_credit">Definition &copy;<a href="https://en.wiktionary.org/" target="_blank">wiktionary.org</a> CC-BY-SA</div>'
        $definition_body.html html
 
 connector_width = 11
-connector_radius = 5
+connector_radius = 4
 connector_slant = 12
 add_connector = (tile, horiz, vert) ->
        style = {}
        switch horiz
                when 'left'
-                       style.right = '100%'
+                       style.left = -9
                when 'mid'
                        style.left = 21 - connector_radius
                when 'right'
-                       style.left = '100%'
+                       style.right = -9
        switch vert
                when 'top'
-                       style.bottom = '100%'
+                       style.top = -9
                when 'up'
                        style.top = 21 - connector_radius - connector_slant
                when 'down'
                        style.top = 21 - connector_radius + connector_slant
                when 'bot'
-                       style.top = '100%'
+                       style.bottom = -9
        tile.connector = $("<div class=\"connector\"></div>").css style
        tile.dom.append tile.connector
 
@@ -824,7 +828,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}"
+               url: "https://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
                dataType: 'jsonp'
                cache: true