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

README.md

@@ -2,30 +2,28 @@
 
 [![Build Status](https://secure.travis-ci.org/systemed/iD.png)](https://travis-ci.org/systemed/iD)
 
-[![](http://ideditor.com/img/editor.png)](http://geowiki.com/iD/)
-
-[Try the online demo of the most recent code.](http://geowiki.com/iD/) and
-[open issues for bugs and ideas!](https://github.com/systemed/iD/issues)
+[![](http://ideditor.com/img/editor.png)](http://ideditor.com/)
 
 ## Basics
 
 * iD is a JavaScript [OpenStreetMap](http://www.openstreetmap.org/) editor.
 * It's intentionally simple. It lets you do the most basic tasks while
   not breaking other people's data.
-* We support modern browsers. Data is rendered with [d3](http://d3js.org/).
+* It supports modern browsers. Data is rendered with [d3](http://d3js.org/).
 
 ## Participate!
 
+* [Try out the latest stable release](http://geowiki.com/iD/)
 * [Read up on Contributing and the code style of iD](CONTRIBUTING.md)
-* See [open issues in the issue tracker if you're looking for something to do](https://github.com/systemed/iD/issues?state=open)
+* See [open issues in the issue tracker](https://github.com/systemed/iD/issues?state=open) if you're looking for something to do
 
-To run the code locally, just fork this project and run it from a local webserver.
-With a Mac, you can enable Web Sharing and drop this in your website directory.
-
-If you have Python handy, just `cd` into `iD` and run
+To run the current development version, fork this project and serve it locally.
+If you have Python handy, just `cd` into the project root directory and run
 
      python -m SimpleHTTPServer
 
+Or, with a Mac, you can enable Web Sharing and clone iD into your website directory.
+
 Come on in, the water's lovely. More help? Ping RichardF, tmcw, or jfire on IRC
 (`irc.oftc.net`, in `#osm-dev` or `#osm`), on the OSM mailing lists or at
 richard@systemeD.net.

js/id/behavior/draw.js

@@ -99,6 +99,8 @@ iD.behavior.Draw = function(context) {
             .on('mousemove.draw', null)
             .on('click.draw', null);
 
+        d3.select(window).on('mouseup.draw', null);
+
         d3.select(document)
             .call(keybinding.off)
             .on('keydown.draw', null)

js/id/behavior/draw_way.js

@@ -165,5 +165,5 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
         context.enter(iD.modes.Browse(context));
     };
 
-    return d3.rebind(drawWay, event, 'on');
+    return drawWay;
 };

js/id/ui/layerswitcher.js

@@ -35,7 +35,7 @@ iD.ui.layerswitcher = function(context) {
             .append('button')
             .attr('tabindex', -1)
             .attr('class', 'fillD')
-            .attr('title', t('layer_settings'))
+            .attr('title', t('layerswitcher.description'))
             .html("<span class='layers icon'></span>")
             .on('click.layerswitcher-toggle', toggle);
 
@@ -59,7 +59,7 @@ iD.ui.layerswitcher = function(context) {
             .append('div')
             .attr('class', 'opacity-options-wrapper');
 
-        opa.append('h4').text(t('layerswitcher.layers'));
+        opa.append('h4').text(t('layerswitcher.title'));
 
         var opacityList = opa.append('ul')
             .attr('class', 'opacity-options');
@@ -151,7 +151,7 @@ iD.ui.layerswitcher = function(context) {
         }
 
         adjustments.append('a')
-            .text('Fix misalignment')
+            .text(t('layerswitcher.fix_misalignment'))
             .attr('href', '#')
             .classed('alignment-toggle', true)
             .classed('expanded', false)
@@ -179,7 +179,7 @@ iD.ui.layerswitcher = function(context) {
             .on('click', nudge);
 
         nudge_container.append('button')
-            .text('reset')
+            .text(t('layerswitcher.reset'))
             .attr('class', 'reset')
             .on('click', function() {
                 context.background().offset([0, 0]);

locale/en.js

@@ -146,8 +146,6 @@ locale.en = {
 
     "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
 
-    "layer_settings": "Layer Settings",
-
     inspector: {
         no_documentation_combination:  "This is no documentation available for this tag combination",
         no_documentation_key: "This is no documentation available for this key",
@@ -168,8 +166,12 @@ locale.en = {
     "description": "Description",
 
     "logout": "logout",
+
     layerswitcher: {
-        layers: "Layers",
-        percent_brightness: "{opacity}% brightness"
+        title: "Background",
+        description: "Background Settings",
+        percent_brightness: "{opacity}% brightness",
+        fix_misalignment: "Fix misalignment",
+        reset: "reset"
     }
 };