From 08423110e99de04eadf104c8be47baaebbff4437 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Wed, 15 Feb 2012 10:43:40 +0000
Subject: [PATCH] omit country name from map tooltip (fixes #396)

---
 source/Ox.UI/js/Core/Ox.Keyboard.js | 2 +-
 source/Ox.UI/js/Map/Ox.MapMarker.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/Ox.UI/js/Core/Ox.Keyboard.js b/source/Ox.UI/js/Core/Ox.Keyboard.js
index 951705e9..18393f0d 100644
--- a/source/Ox.UI/js/Core/Ox.Keyboard.js
+++ b/source/Ox.UI/js/Core/Ox.Keyboard.js
@@ -9,7 +9,7 @@ Ox.Keyboard = (function() {
     var buffer = '', bound = [], resetTimeout, triggerTimeout;
 
     Ox.UI.ready(function() {
-        Ox.UI.$document.keydown(keydown)
+        Ox.$document.keydown(keydown)
     });
 
     function keydown(event) {
diff --git a/source/Ox.UI/js/Map/Ox.MapMarker.js b/source/Ox.UI/js/Map/Ox.MapMarker.js
index ad3a6053..dd811bcc 100644
--- a/source/Ox.UI/js/Map/Ox.MapMarker.js
+++ b/source/Ox.UI/js/Map/Ox.MapMarker.js
@@ -245,9 +245,7 @@ Ox.MapMarker = function(options) {
                     + Ox.getFlagByGeoname(that.place.geoname, 16)
                     + '" style="float: left; margin: 1px 0 1px -1px; border-radius: 4px"/>'
                     + '<div style="float: left; margin: 4px -1px 0 4px; font-size: 9px;">'
-                    + that.place.name
-                    + (country && country.name != that.place.name ? ', ' + country.name : '')
-                    + '</div>'
+                    + that.place.name + '</div>'
             })
             .addClass('OxMapMarkerTooltip');
     }