Fix issue where map cursors could be incorrect (close #6450, close #6452

)
openstreetmap · May 29, 2019 · da81fb3 · da81fb3
1 parent 9eee5e9
commit da81fb3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/modules/core/context.js b/modules/core/context.js
@@ -261,11 +261,13 @@ export function coreContext() {
     context.enter = function(newMode) {
         if (mode) {
             mode.exit();
+            container.classed('mode-' + mode.id, false);
             dispatch.call('exit', this, mode);
         }
 
         mode = newMode;
         mode.enter();
+        container.classed('mode-' + newMode.id, true);
         dispatch.call('enter', this, mode);
     };
 

diff --git a/modules/ui/tools/add_favorite.js b/modules/ui/tools/add_favorite.js
@@ -46,14 +46,6 @@ export function uiToolAddFavorite(context) {
             .on('enter.editor.favorite', function(entered) {
                 selection.selectAll('button.add-button')
                     .classed('active', function(mode) { return entered.button === mode.button; });
-                context.container()
-                    .classed('mode-' + entered.id, true);
-            });
-
-        context
-            .on('exit.editor.favorite', function(exited) {
-                context.container()
-                    .classed('mode-' + exited.id, false);
             });
 
         var debouncedUpdate = _debounce(update, 500, { leading: true, trailing: true });

diff --git a/modules/ui/tools/add_recent.js b/modules/ui/tools/add_recent.js
@@ -85,14 +85,6 @@ export function uiToolAddRecent(context) {
             .on('enter.editor.recent', function(entered) {
                 selection.selectAll('button.add-button')
                     .classed('active', function(mode) { return entered.button === mode.button; });
-                context.container()
-                    .classed('mode-' + entered.id, true);
-            });
-
-        context
-            .on('exit.editor.recent', function(exited) {
-                context.container()
-                    .classed('mode-' + exited.id, false);
             });
 
         var debouncedUpdate = _debounce(update, 500, { leading: true, trailing: true });

diff --git a/modules/ui/tools/notes.js b/modules/ui/tools/notes.js
@@ -51,14 +51,6 @@ export function uiToolNotes(context) {
             .on('enter.editor.notes', function(entered) {
                 selection.selectAll('button.add-button')
                     .classed('active', function(mode) { return entered.button === mode.button; });
-                context.container()
-                    .classed('mode-' + entered.id, true);
-            });
-
-        context
-            .on('exit.editor.notes', function(exited) {
-                context.container()
-                    .classed('mode-' + exited.id, false);
             });