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

Merge, continue to tweak note_editor

Browse Source
This commit is contained in:
Bryan Housel
2018-07-02 12:50:53 -04:00
parent a474e3bb9f
commit 94eae89fc3
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ui/note_editor.js
View File

@@ -32,7 +32,7 @@ export function uiNoteEditor(context) {
function noteHeader(selection) {
selection.selectAll('.note-header')
.data(_note, function(d) { return d.id; })
.data([_note], function(d) { return d.id; })
.enter()
.append('h3')
.attr('class', 'note-header')

40
modules/ui/sidebar.js
View File

@@ -1,18 +1,17 @@
import _throttle from 'lodash-es/throttle';
import { osmNote } from '../osm';
import { uiFeatureList } from './feature_list';
import { uiInspector } from './inspector';
import { uiNoteEditor } from './note_editor';
import {
osmNote
} from '../osm';
export function uiSidebar(context) {
var inspector = uiInspector(context);
var noteEditor = uiNoteEditor(context);
var _current;
var _wasNote = false;
var inspector = uiInspector(context),
noteEditor = uiNoteEditor(context),
current,
wasNote = false;
function sidebar(selection) {
var featureListWrap = selection
@@ -28,10 +27,10 @@ export function uiSidebar(context) {
function hover(what) {
if ((what instanceof osmNote)) {
wasNote = true;
context.ui().sidebar.show(noteEditor, what);
}
else if (!current && context.hasEntity(what)) {
_wasNote = true;
context.ui().sidebar.show(noteEditor.note(what));
} else if (!_current && context.hasEntity(what)) {
featureListWrap
.classed('inspector-hidden', true);
@@ -48,15 +47,16 @@ export function uiSidebar(context) {
.call(inspector);
}
} else if (!current) {
} else if (!_current) {
featureListWrap
.classed('inspector-hidden', false);
inspectorWrap
.classed('inspector-hidden', true);
inspector
.state('hide');
} else if (wasNote) {
wasNote = false;
} else if (_wasNote) {
_wasNote = false;
context.ui().sidebar.hide();
}
}
@@ -66,7 +66,7 @@ export function uiSidebar(context) {
sidebar.select = function(id, newFeature) {
if (!current && id) {
if (!_current && id) {
featureListWrap
.classed('inspector-hidden', true);
@@ -84,7 +84,7 @@ export function uiSidebar(context) {
.call(inspector);
}
} else if (!current) {
} else if (!_current) {
featureListWrap
.classed('inspector-hidden', false);
inspectorWrap
@@ -101,8 +101,8 @@ export function uiSidebar(context) {
inspectorWrap
.classed('inspector-hidden', true);
if (current) current.remove();
current = selection
if (_current) _current.remove();
_current = selection
.append('div')
.attr('class', 'sidebar-component')
.call(component, element);
@@ -115,8 +115,8 @@ export function uiSidebar(context) {
inspectorWrap
.classed('inspector-hidden', true);
if (current) current.remove();
current = null;
if (_current) _current.remove();
_current = null;
};
}