Merge branch 'master' of github.com:systemed/iD

css/app.css

@@ -2089,23 +2089,4 @@ a.success-action {
 }
 ::-webkit-scrollbar-corner {
     background: transparent
-}
-
-/* clearfix */
-.clearfix:after {
-	content: ".";
-	display: block;
-	clear: both;
-	visibility: hidden;
-	line-height: 0;
-	height: 0;
-}
-.clearfix {
-	display: inline-block;
-}
-html[xmlns] .clearfix {
-	display: block;
-}
-* html .clearfix {
-	height: 1%;
-}
+}

css/map.css

@@ -29,18 +29,20 @@ use {
 
 g.point .shadow,
 g.vertex .shadow,
-g.midpoint .shadow,
-path.shadow {
+g.midpoint .shadow {
     pointer-events: all;
-    -webkit-transition: 200ms;
-       -moz-transition: 200ms;
-            transition: 200ms;
 }
 
 path.shadow {
     pointer-events: stroke;
 }
 
+.shadow {
+    -webkit-transition: 200ms;
+       -moz-transition: 200ms;
+            transition: 200ms;
+}
+
 /* points */
 
 g.point .stroke {

data/update_locales.js

@@ -20,13 +20,17 @@ var project = api + 'project/id-editor/';
 
 var auth = JSON.parse(fs.readFileSync('./transifex.auth', 'utf8'));
 
+var sourceCore = yaml.load(fs.readFileSync('./data/core.yaml', 'utf8')),
+    sourcePresets = yaml.load(fs.readFileSync('./data/presets.yaml', 'utf8'));
+
 asyncMap(resources, getResource, function(err, locales) {
     if (err) return console.log(err);
     var out = '';
-    var locale = {};
+    var locale = _.merge(sourceCore, sourcePresets);
     locales.forEach(function(l) {
         locale = _.merge(locale, l);
     });
+
     for (var i in locale) {
         out += 'locale.' + i + ' = ' + JSON.stringify(locale[i], null, 4) + ';';
     }
@@ -68,6 +72,8 @@ function getLanguages(resource, callback) {
         if (err) return callback(err);
         callback(null, JSON.parse(body).available_languages.map(function(d) {
             return d.code;
+        }).filter(function(d) {
+            return d !== 'en';
         }));
     });
 }

js/id/ui/background.js

@@ -44,14 +44,22 @@ iD.ui.Background = function(context) {
                 button.classed('active', show);
                 content.call(iD.ui.Toggle(show));
                 shown = show;
+
+                if (show) {
+                    selection.on('mousedown.background-inside', function() {
+                        return d3.event.stopPropagation();
+                    });
+                } else {
+                    selection.on('mousedown.background-inside', null);
+                }
             }
         }
 
-        selection.on('mousedown.background-inside', function() {
-            return d3.event.stopPropagation();
+        context.surface().on('mousedown.background-outside', function() {
+            setVisible(false);
         });
 
-        context.surface().on('mousedown.background-outside', function() {
+        context.container().on('mousedown.background-outside', function() {
             setVisible(false);
         });
 

js/id/ui/geocoder.js

@@ -86,6 +86,14 @@ iD.ui.Geocoder = function(context) {
                 if (show) inputNode.node().focus();
                 else inputNode.node().blur();
                 shown = show;
+
+                if (show) {
+                    selection.on('mousedown.geocoder-inside', function() {
+                        return d3.event.stopPropagation();
+                    });
+                } else {
+                    selection.on('mousedown.geocoder-inside', null);
+                }
             }
         }
         var tooltip = bootstrap.tooltip()
@@ -112,11 +120,8 @@ iD.ui.Geocoder = function(context) {
         var resultsList = selection.append('div')
             .attr('class', 'content fillD map-overlay hide');
 
-        selection.on('mousedown.geocoder-inside', function() {
-            return d3.event.stopPropagation();
-        });
-
         context.surface().on('mousedown.geocoder-outside', hide);
+        context.container().on('mousedown.b.geocoder-outside', hide);
 
         var keybinding = d3.keybinding('geocoder');
 

js/id/ui/preset_grid.js

@@ -22,7 +22,7 @@ iD.ui.PresetGrid = function(context) {
             .attr('class', 'fillL inspector-body inspector-body-' + entity.geometry(context.graph()));
 
         var grid = gridwrap.append('div')
-            .attr('class', 'preset-grid fillL clearfix')
+            .attr('class', 'preset-grid fillL cf')
             .data([context.presets().defaults(entity, 36).collection]);
 
         var show_more = gridwrap.append('div')