From b2fe5744d50969d404a1f36832afa5f9e92318cb Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 12 May 2016 00:50:31 -0400
Subject: [PATCH] =?UTF-8?q?Use=20=E2=8C=98=20B=20for=20quick=20background?=
 =?UTF-8?q?=20switching,=20add=20tooltip,=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/app.css            |  7 ++---
 data/core.yaml         |  1 +
 dist/locales/en.json   |  1 +
 js/id/ui/background.js | 60 +++++++++++++++++++++++-------------------
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/css/app.css b/css/app.css
index a7931a2da..67d0e7f0c 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1879,7 +1879,8 @@ div.full-screen > button:hover {
     background-color: #ececec;
 }
 
-.layer-list li.active {
+.layer-list li.active,
+.layer-list li.switch {
     background: #E8EBFF;
 }
 
@@ -1895,10 +1896,6 @@ div.full-screen > button:hover {
     max-width: 160px;
 }
 
-.layer-list li.switch {
-    background: #fffce8;
-}
-
 .layer-list label {
     display: block;
     padding: 5px 10px;
diff --git a/data/core.yaml b/data/core.yaml
index e6c6bb5b4..7af8cba01 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -274,6 +274,7 @@ en:
     percent_brightness: "{opacity}% brightness"
     none: None
     best_imagery: Best known imagery source for this location
+    switch: Switch back to this background
     custom: Custom
     custom_button: Edit custom background
     custom_prompt: "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme."
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 3605332e3..9adfa707b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -330,6 +330,7 @@
         "percent_brightness": "{opacity}% brightness",
         "none": "None",
         "best_imagery": "Best known imagery source for this location",
+        "switch": "Switch back to this background",
         "custom": "Custom",
         "custom_button": "Edit custom background",
         "custom_prompt": "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index abf846801..015642ec8 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -9,7 +9,7 @@ iD.ui.Background = function(context) {
         opacityDefault = (context.storage('background-opacity') !== null) ?
             (+context.storage('background-opacity')) : 1.0,
         customTemplate = context.storage('background-custom-template') || '',
-        latestBg = [context.background().baseLayerSource(), null];
+        previous;
 
     // Can be 0 from <1.3.0 use or due to issue #1923.
     if (opacityDefault === 0) opacityDefault = 1.0;
@@ -39,29 +39,48 @@ iD.ui.Background = function(context) {
             context.storage('background-opacity', d);
         }
 
+        function setTooltips(selection) {
+            selection.each(function(d) {
+                var item = d3.select(this);
+                if (d === previous) {
+                    item.call(bootstrap.tooltip()
+                        .html(true)
+                        .title(function() {
+                            var tip = '<div>' + t('background.switch') + '</div>';
+                            return iD.ui.tooltipHtml(tip, iD.ui.cmd('⌘B'));
+                        })
+                        .placement('top')
+                    );
+                } else if (d.description) {
+                    item.call(bootstrap.tooltip()
+                        .title(d.description)
+                        .placement('top')
+                    );
+                } else {
+                    item.call(bootstrap.tooltip().destroy);
+                }
+            });
+        }
+
         function selectLayer() {
             function active(d) {
                 return context.background().showsLayer(d);
             }
 
-            function bgswitch(d) {
-                return latestBg[1] === d;
-            }
-
             content.selectAll('.layer, .custom_layer')
                 .classed('active', active)
-                .classed('switch', bgswitch)
+                .classed('switch', function(d) { return d === previous; })
+                .call(setTooltips)
                 .selectAll('input')
                 .property('checked', active);
         }
 
         function clickSetSource(d) {
-            latestBg[1] = latestBg[0];
-            latestBg[0] = d;
-
+            previous = context.background().baseLayerSource();
             d3.event.preventDefault();
             context.background().baseLayerSource(d);
             selectLayer();
+            document.activeElement.blur();
         }
 
         function editCustom() {
@@ -87,6 +106,7 @@ iD.ui.Background = function(context) {
             d3.event.preventDefault();
             context.background().toggleOverlayLayer(d);
             selectLayer();
+            document.activeElement.blur();
         }
 
         function drawList(layerList, type, change, filter) {
@@ -102,12 +122,6 @@ iD.ui.Background = function(context) {
                 .attr('class', 'layer')
                 .classed('best', function(d) { return d.best(); });
 
-            // only set tooltips for layers with tooltips
-            enter.filter(function(d) { return d.description; })
-                .call(bootstrap.tooltip()
-                    .title(function(d) { return d.description; })
-                    .placement('top'));
-
             enter.filter(function(d) { return d.best(); })
                 .append('div')
                 .attr('class', 'best')
@@ -251,18 +265,10 @@ iD.ui.Background = function(context) {
             setVisible(!button.classed('active'));
         }
 
-        function interchangeBg() {
-            var d = latestBg[1];
-            if (d == null) {
-                toggle();
-                return;
+        function quickSwitch() {
+            if (previous) {
+                clickSetSource(previous);
             }
-
-            latestBg[1] = latestBg[0];
-            latestBg[0] = d;
-
-            context.background().baseLayerSource(d);
-            selectLayer();
         }
 
         function setVisible(show) {
@@ -471,7 +477,7 @@ iD.ui.Background = function(context) {
 
         var keybinding = d3.keybinding('background')
             .on(key, toggle)
-            .on('I', interchangeBg)
+            .on(iD.ui.cmd('⌘B'), quickSwitch)
             .on('F', hide)
             .on('H', hide);