disband ui/core

modules/ui/account.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function Account(context) {
     var connection = context.connection();
 

modules/ui/background.js

@@ -1,7 +1,7 @@
-import { Icon } from '../../svg/index';
-import { setTransform } from '../../util/index';
-import { BackgroundSource } from '../../renderer/index';
-import { offsetToMeters, metersToOffset } from '../../geo/index';
+import { Icon } from '../svg/index';
+import { setTransform } from '../util/index';
+import { BackgroundSource } from '../renderer/index';
+import { offsetToMeters, metersToOffset } from '../geo/index';
 import { cmd } from './cmd';
 import { MapInMap } from './map_in_map';
 import { tooltipHtml } from './tooltipHtml';

modules/ui/commit.js

@@ -1,6 +1,6 @@
-import { Icon } from '../../svg/index';
-import { entityOrMemberSelector, displayName } from '../../util/index';
-import { Select } from '../../modes/index';
+import { Icon } from '../svg/index';
+import { entityOrMemberSelector, displayName } from '../util/index';
+import { Select } from '../modes/index';
 export function Commit(context) {
     var dispatch = d3.dispatch('cancel', 'save');
 

modules/ui/conflicts.js

@@ -1,6 +1,6 @@
-import { Icon } from '../../svg/index';
-import { entityOrMemberSelector } from '../../util/index';
-import { Extent } from '../../geo/index';
+import { Icon } from '../svg/index';
+import { entityOrMemberSelector } from '../util/index';
+import { Extent } from '../geo/index';
 export function Conflicts(context) {
     var dispatch = d3.dispatch('download', 'cancel', 'save'),
         list;

modules/ui/contributors.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function Contributors(context) {
     var debouncedUpdate = _.debounce(function() { update(); }, 1000),
         limit = 4,

modules/ui/entity_editor.js

@@ -1,6 +1,6 @@
-import { Icon } from '../../svg/index';
-import { Browse } from '../../modes/index';
-import { ChangeTags } from '../../actions/index';
+import { Icon } from '../svg/index';
+import { Browse } from '../modes/index';
+import { ChangeTags } from '../actions/index';
 import { preset as presetModule } from './preset';
 import { PresetIcon } from './preset_icon';
 import { RawTagEditor } from './raw_tag_editor';

modules/ui/feature_list.js

@@ -1,8 +1,8 @@
-import { Icon } from '../../svg/index';
-import { Entity } from '../../core/index';
-import { displayName, entityOrMemberSelector } from '../../util/index';
-import { Select } from '../../modes/index';
-import { Extent, chooseEdge } from '../../geo/index';
+import { Icon } from '../svg/index';
+import { Entity } from '../core/index';
+import { displayName, entityOrMemberSelector } from '../util/index';
+import { Select } from '../modes/index';
+import { Extent, chooseEdge } from '../geo/index';
 import * as sexagesimal from 'sexagesimal';
 
 export function FeatureList(context) {

modules/ui/fields/index.js

@@ -12,7 +12,7 @@ import { restrictions } from './restrictions';
 import { textarea } from './textarea';
 import { wikipedia } from './wikipedia';
 
-export var presetObj = {
+export var fields = {
     access: access,
     address: address,
     check: check,

modules/ui/geolocate.js

@@ -1,6 +1,6 @@
-import { Icon } from '../../svg/index';
-import { Browse } from '../../modes/index';
-import { Extent } from '../../geo/index';
+import { Icon } from '../svg/index';
+import { Browse } from '../modes/index';
+import { Extent } from '../geo/index';
 import { Loading } from './loading';
 
 export function Geolocate(context) {

modules/ui/help.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 import { intro } from './intro';
 import { tooltipHtml } from './tooltipHtml';
 

modules/ui/index.js

@@ -1,56 +1,55 @@
 import { ui } from './ui';
 import { presetObj } from './preset/index';
-import {
-    Account,
-    Attribution,
-    Background,
-    cmd,
-    Commit,
-    confirm,
-    Conflicts,
-    Contributors,
-    Disclosure,
-    EntityEditor,
-    FeatureInfo,
-    FeatureList,
-    flash,
-    FullScreen,
-    Geolocate,
-    Help,
-    Info,
-    Inspector,
-    intro,
-    Lasso,
-    Loading,
-    MapData,
-    MapInMap,
-    modal,
-    Modes,
-    Notice,
-    preset,
-    PresetIcon,
-    PresetList,
-    RadialMenu,
-    RawMemberEditor,
-    RawMembershipEditor,
-    RawTagEditor,
-    Restore,
-    Save,
-    Scale,
-    SelectionList,
-    Sidebar,
-    SourceSwitch,
-    Spinner,
-    Splash,
-    Status,
-    Success,
-    TagReference,
-    Toggle,
-    tooltipHtml,
-    UndoRedo,
-    ViewOnOSM,
-    Zoom
-} from './core/index';
+import { Account } from './account';
+import { Attribution } from './attribution';
+import { Background } from './background';
+import { cmd } from './cmd';
+import { Commit } from './commit';
+import { confirm } from './confirm';
+import { Conflicts } from './conflicts';
+import { Contributors } from './contributors';
+import { Disclosure } from './disclosure';
+import { EntityEditor } from './entity_editor';
+import { FeatureInfo } from './feature_info';
+import { FeatureList } from './feature_list';
+import { flash } from './flash';
+import { FullScreen } from './full_screen';
+import { Geolocate } from './geolocate';
+import { Help } from './help';
+import { Info } from './info';
+import { Inspector } from './inspector';
+import { intro } from './intro';
+import { Lasso } from './lasso';
+import { Loading } from './loading';
+import { MapData } from './map_data';
+import { MapInMap } from './map_in_map';
+import { modal } from './modal';
+import { Modes } from './modes';
+import { Notice } from './notice';
+import { preset } from './preset';
+import { PresetIcon } from './preset_icon';
+import { PresetList } from './preset_list';
+import { RadialMenu } from './radial_menu';
+import { RawMemberEditor } from './raw_member_editor';
+import { RawMembershipEditor } from './raw_membership_editor';
+import { RawTagEditor } from './raw_tag_editor';
+import { Restore } from './restore';
+import { Save } from './save';
+import { Scale } from './scale';
+import { SelectionList } from './selection_list';
+import { Sidebar } from './sidebar';
+import { SourceSwitch } from './source_switch';
+import { Spinner } from './spinner';
+import { Splash } from './splash';
+import { Status } from './status';
+import { Success } from './success';
+import { TagReference } from './tag_reference';
+import { Toggle } from './toggle';
+import { tooltipHtml } from './tooltipHtml';
+import { UndoRedo } from './undo_redo';
+import { ViewOnOSM } from './view_on_osm';
+import { Zoom } from './zoom';
+
 export {ui};
 
 ui.preset = preset;

modules/ui/info.js

@@ -1,4 +1,4 @@
-import { Extent } from '../../geo/index';
+import { Extent } from '../geo/index';
 import { cmd } from './cmd';
 
 export function Info(context) {

modules/ui/intro.js

@@ -1,7 +1,7 @@
-import { Icon } from '../../svg/index';
-import { Entity, Graph } from '../../core/index';
-import { Browse } from '../../modes/index';
-import { Intro } from '../intro/index';
+import { Icon } from '../svg/index';
+import { Entity, Graph } from '../core/index';
+import { Browse } from '../modes/index';
+import { Intro } from './intro/index';
 
 export function intro(context) {
     var step;

modules/ui/lasso.js

@@ -1,4 +1,4 @@
-import { Extent } from '../../geo/index';
+import { Extent } from '../geo/index';
 import { Toggle } from './toggle';
 
 export function Lasso(context) {

modules/ui/map_data.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 import { tooltipHtml } from './tooltipHtml';
 
 export function MapData(context) {

modules/ui/map_in_map.js

@@ -1,7 +1,7 @@
-import { Gpx, Debug } from '../../svg/index';
-import { setTransform } from '../../util/index';
-import { RawMercator } from '../../geo/index';
-import { TileLayer } from '../../renderer/index';
+import { Gpx, Debug } from '../svg/index';
+import { setTransform } from '../util/index';
+import { RawMercator } from '../geo/index';
+import { TileLayer } from '../renderer/index';
 
 export function MapInMap(context) {
     var key = '/';

modules/ui/modal.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function modal(selection, blocking) {
     var keybinding = d3.keybinding('modal');
     var previous = selection.select('div.modal');

modules/ui/modes.js

@@ -1,5 +1,5 @@
-import { Icon } from '../../svg/index';
-import { AddPoint, AddLine, AddArea, Browse } from '../../modes/index';
+import { Icon } from '../svg/index';
+import { AddPoint, AddLine, AddArea, Browse } from '../modes/index';
 import { tooltipHtml } from './tooltipHtml';
 
 export function Modes(context) {

modules/ui/notice.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function Notice(context) {
     return function(selection) {
         var div = selection.append('div')

modules/ui/preset.js

@@ -1,7 +1,7 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 import { TagReference } from './tag_reference';
-import { Browse } from '../../modes/index';
-import { presetObj } from '../preset/index';
+import { Browse } from '../modes/index';
+import { fields as fieldsObj } from './fields/index';
 import { Disclosure } from './disclosure';
 
 export function preset(context) {
@@ -15,7 +15,7 @@ export function preset(context) {
     function UIField(field, entity, show) {
         field = _.clone(field);
 
-        field.input = presetObj[field.type](field, context)
+        field.input = fieldsObj[field.type](field, context)
             .on('change', event.change);
 
         if (field.input.entity) field.input.entity(entity);

modules/ui/preset_icon.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function PresetIcon() {
     var preset, geometry;
 

modules/ui/preset_list.js

@@ -1,7 +1,7 @@
-import { Icon } from '../../svg/index';
-import { Browse } from '../../modes/index';
-import { ChangePreset } from '../../actions/index';
-import { Delete } from '../../operations/index';
+import { Icon } from '../svg/index';
+import { Browse } from '../modes/index';
+import { ChangePreset } from '../actions/index';
+import { Delete } from '../operations/index';
 import { PresetIcon } from './preset_icon';
 import { TagReference } from './tag_reference';
 

modules/ui/radial_menu.js

@@ -1,4 +1,4 @@
-import { roundCoords } from '../../geo/index';
+import { roundCoords } from '../geo/index';
 import { tooltipHtml } from './tooltipHtml';
 
 export function RadialMenu(context, operations) {

modules/ui/raw_member_editor.js

@@ -1,8 +1,8 @@
-import { Icon } from '../../svg/index';
-import { Entity } from '../../core/index';
-import { displayName } from '../../util/index';
-import { Select, Browse } from '../../modes/index';
-import { ChangeMember, DeleteMember } from '../../actions/index';
+import { Icon } from '../svg/index';
+import { Entity } from '../core/index';
+import { displayName } from '../util/index';
+import { Select, Browse } from '../modes/index';
+import { ChangeMember, DeleteMember } from '../actions/index';
 import { Disclosure } from './disclosure';
 
 export function RawMemberEditor(context) {

modules/ui/raw_membership_editor.js

@@ -1,8 +1,8 @@
-import { Icon } from '../../svg/index';
-import { Relation, Entity } from '../../core/index';
-import { displayName } from '../../util/index';
-import { Select } from '../../modes/index';
-import { ChangeMember, AddMember, AddEntity, DeleteMember } from '../../actions/index';
+import { Icon } from '../svg/index';
+import { Relation, Entity } from '../core/index';
+import { displayName } from '../util/index';
+import { Select } from '../modes/index';
+import { ChangeMember, AddMember, AddEntity, DeleteMember } from '../actions/index';
 import { Disclosure } from './disclosure';
 
 export function RawMembershipEditor(context) {

modules/ui/raw_tag_editor.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 import { Disclosure } from './disclosure';
 import { TagReference } from './tag_reference';
 

modules/ui/save.js

@@ -1,4 +1,4 @@
-import { Save as SaveMode } from '../../modes/index';
+import { Save as SaveMode } from '../modes/index';
 import { cmd } from './cmd';
 import { tooltipHtml } from './tooltipHtml';
 

modules/ui/scale.js

@@ -1,4 +1,4 @@
-import { lonToMeters, metersToLon } from '../../geo/index';
+import { lonToMeters, metersToLon } from '../geo/index';
 export function Scale(context) {
     var projection = context.projection,
         imperial = (iD.detect().locale.toLowerCase() === 'en-us'),

modules/ui/selection_list.js

@@ -1,7 +1,7 @@
-import { Icon } from '../../svg/index';
-import { Entity } from '../../core/index';
-import { displayName } from '../../util/index';
-import { Select } from '../../modes/index';
+import { Icon } from '../svg/index';
+import { Entity } from '../core/index';
+import { displayName } from '../util/index';
+import { Select } from '../modes/index';
 export function SelectionList(context, selectedIDs) {
 
     function selectEntity(entity) {

modules/ui/source_switch.js

@@ -1,4 +1,4 @@
-import { Browse } from '../../modes/index';
+import { Browse } from '../modes/index';
 export function SourceSwitch(context) {
     var keys;
 

modules/ui/success.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function Success(context) {
     var dispatch = d3.dispatch('cancel'),
         changeset;

modules/ui/tag_reference.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function TagReference(tag, context) {
     var tagReference = {},
         button,

modules/ui/undo_redo.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 import { cmd } from './cmd';
 import { tooltipHtml } from './tooltipHtml';
 

modules/ui/view_on_osm.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 export function ViewOnOSM(context) {
     var id;
 

modules/ui/zoom.js

@@ -1,4 +1,4 @@
-import { Icon } from '../../svg/index';
+import { Icon } from '../svg/index';
 import { cmd } from './cmd';
 import { tooltipHtml } from './tooltipHtml';