CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-31 09:19:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize the code for setting the mode class on the container

Browse Source
This commit is contained in:
Quincy Morgan
2020-05-29 17:18:10 -04:00
parent 7877e8ab9e
commit 620d79bfc8
3 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ui/init.js
View File

@@ -364,6 +364,16 @@ export function uiInit(context) {
context.map().toggleHighlightEdited();
});
context
.on('enter.editor', function(entered) {
container
.classed('mode-' + entered.id, true);
})
.on('exit.editor', function(exited) {
container
.classed('mode-' + exited.id, false);
});
context.enter(modeBrowse(context));
if (!_initCounter++) {

18
modules/ui/tools/modes.js
View File

@@ -73,21 +73,6 @@ export function uiToolOldDrawModes(context) {
.attr('class', 'joined')
.style('display', 'flex');
context
.on('enter.editor', 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', function(exited) {
context.container()
.classed('mode-' + exited.id, false);
});
var debouncedUpdate = _debounce(update, 500, { leading: true, trailing: true });
context.map()
@@ -152,7 +137,8 @@ export function uiToolOldDrawModes(context) {
// update
buttons = buttons
.merge(buttonsEnter)
.classed('disabled', function(d) { return !enabled(d); });
.classed('disabled', function(d) { return !enabled(d); })
.classed('active', function(d) { return context.mode() && context.mode().button === d.button; });
}
};

17
modules/ui/tools/notes.js
View File

@@ -46,20 +46,6 @@ export function uiToolNotes(context) {
tool.render = function(selection) {
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);
});
var debouncedUpdate = _debounce(update, 500, { leading: true, trailing: true });
@@ -123,7 +109,8 @@ export function uiToolNotes(context) {
// update
buttons = buttons
.merge(buttonsEnter)
.classed('disabled', function(d) { return !enabled(d); });
.classed('disabled', function(d) { return !enabled(d); })
.classed('active', function(d) { return context.mode() && context.mode().button === d.button; });
}
};