Move lib/d3.combobox.js -> ui/combobox.js

As with other things from this lib/ folder, little original code remains
and turning these things into reusable d3 plugins is not a priority.
This commit is contained in:
Bryan Housel
2018-12-10 12:38:21 -05:00
parent 54a4546306
commit e5dedeff8b
18 changed files with 50 additions and 107 deletions
+3 -7
View File
@@ -1,12 +1,8 @@
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { select as d3_select } from 'd3-selection';
import { d3combobox as d3_combobox } from '../../lib/d3.combobox.js';
import {
utilGetSetValue,
utilNoAuto,
utilRebind
} from '../../util';
import { uiCombobox } from '../index';
import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
export function uiFieldAccess(field, context) {
@@ -55,7 +51,7 @@ export function uiFieldAccess(field, context) {
.call(utilNoAuto)
.each(function(d) {
d3_select(this)
.call(d3_combobox()
.call(uiCombobox()
.container(context.container())
.data(access.options(d))
);
+4 -14
View File
@@ -5,22 +5,12 @@ import _uniqBy from 'lodash-es/uniqBy';
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { select as d3_select } from 'd3-selection';
import { d3combobox as d3_combobox } from '../../lib/d3.combobox.js';
import { dataAddressFormats } from '../../../data';
import {
geoExtent,
geoChooseEdge,
geoSphericalDistance
} from '../../geo';
import { geoExtent, geoChooseEdge, geoSphericalDistance } from '../../geo';
import { services } from '../../services';
import {
utilGetSetValue,
utilNoAuto,
utilRebind
} from '../../util';
import { uiCombobox } from '../index';
import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
export function uiFieldAddress(field, context) {
@@ -183,7 +173,7 @@ export function uiFieldAddress(field, context) {
: getNearValues;
wrap.selectAll('input.addr-' + tag)
.call(d3_combobox()
.call(uiCombobox()
.container(context.container())
.minItems(1)
.fetcher(function(value, callback) {
+3 -9
View File
@@ -14,16 +14,10 @@ import {
select as d3_select
} from 'd3-selection';
import { d3combobox as d3_combobox } from '../../lib/d3.combobox.js';
import { t } from '../../util/locale';
import { services } from '../../services';
import {
utilGetSetValue,
utilNoAuto,
utilRebind
} from '../../util';
import { uiCombobox } from '../index';
import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
export {
uiFieldCombo as uiFieldMultiCombo,
@@ -44,7 +38,7 @@ export function uiFieldCombo(field, context) {
var optarray = field.options;
var snake_case = (field.snake_case || (field.snake_case === undefined));
var caseSensitive = field.caseSensitive;
var combobox = d3_combobox()
var combobox = uiCombobox()
.container(context.container())
.caseSensitive(caseSensitive)
.minItems(isMulti || isSemi ? 1 : 2);
+3 -7
View File
@@ -1,12 +1,8 @@
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { select as d3_select } from 'd3-selection';
import { d3combobox as d3_combobox } from '../../lib/d3.combobox.js';
import {
utilGetSetValue,
utilNoAuto,
utilRebind
} from '../../util';
import { uiCombobox } from '../index';
import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
export function uiFieldCycleway(field, context) {
@@ -61,7 +57,7 @@ export function uiFieldCycleway(field, context) {
.call(utilNoAuto)
.each(function(d) {
d3_select(this)
.call(d3_combobox()
.call(uiCombobox()
.container(context.container())
.data(cycleway.options(d))
);
+4 -9
View File
@@ -7,20 +7,15 @@ import {
event as d3_event
} from 'd3-selection';
import { d3combobox as d3_combobox } from '../../lib/d3.combobox.js';
import { t } from '../../util/locale';
import { dataWikipedia } from '../../../data';
import { services } from '../../services';
import { svgIcon } from '../../svg';
import { tooltip } from '../../util/tooltip';
import { uiCombobox } from '../index';
import { utilDetect } from '../../util/detect';
import {
utilEditDistance,
utilGetSetValue,
utilNoAuto,
utilRebind
} from '../../util';
import { utilEditDistance, utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
export function uiFieldLocalized(field, context) {
@@ -34,12 +29,12 @@ export function uiFieldLocalized(field, context) {
});
// reuse these combos
var langcombo = d3_combobox()
var langcombo = uiCombobox()
.container(context.container())
.fetcher(fetchLanguages)
.minItems(0);
var brandcombo = d3_combobox()
var brandcombo = uiCombobox()
.container(context.container())
.canAutocomplete(false)
.minItems(1);
+4 -8
View File
@@ -2,15 +2,11 @@ import _some from 'lodash-es/some';
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { select as d3_select } from 'd3-selection';
import { d3combobox as d3_combobox } from '../../lib/d3.combobox.js';
import { dataImperial } from '../../../data';
import { geoPointInPolygon } from '../../geo';
import {
utilGetSetValue,
utilNoAuto,
utilRebind
} from '../../util';
import { uiCombobox } from '../index';
import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
export function uiFieldMaxspeed(field, context) {
@@ -26,10 +22,10 @@ export function uiFieldMaxspeed(field, context) {
function maxspeed(selection) {
combobox = d3_combobox()
combobox = uiCombobox()
.container(context.container());
var unitCombobox = d3_combobox()
var unitCombobox = uiCombobox()
.container(context.container())
.data(['km/h', 'mph'].map(comboValues));
+4 -9
View File
@@ -8,19 +8,14 @@ import {
event as d3_event
} from 'd3-selection';
import { d3combobox as d3_combobox } from '../../lib/d3.combobox.js';
import { t } from '../../util/locale';
import { actionChangeTags } from '../../actions/index';
import { dataWikipedia } from '../../../data/index';
import { services } from '../../services/index';
import { svgIcon } from '../../svg/index';
import { uiCombobox } from '../index';
import { utilDetect } from '../../util/detect';
import {
utilGetSetValue,
utilNoAuto,
utilRebind
} from '../../util';
import { utilGetSetValue, utilNoAuto, utilRebind } from '../../util';
export function uiFieldWikipedia(field, context) {
@@ -34,7 +29,7 @@ export function uiFieldWikipedia(field, context) {
function wiki(selection) {
var langcombo = d3_combobox()
var langcombo = uiCombobox()
.container(context.container())
.fetcher(function(value, cb) {
var v = value.toLowerCase();
@@ -48,7 +43,7 @@ export function uiFieldWikipedia(field, context) {
}));
});
var titlecombo = d3_combobox()
var titlecombo = uiCombobox()
.container(context.container())
.fetcher(function(value, cb) {
if (!value) {