From 7188065a6cafe055bbc1e560e40ed8197c3feab6 Mon Sep 17 00:00:00 2001 From: Kushan Joshi <0o3ko0@gmail.com> Date: Sat, 2 Jul 2016 19:04:51 +0530 Subject: [PATCH] disband ui/core --- modules/ui/{core => }/account.js | 2 +- modules/ui/{core => }/attribution.js | 0 modules/ui/{core => }/background.js | 8 +- modules/ui/{core => }/cmd.js | 0 modules/ui/{core => }/commit.js | 6 +- modules/ui/{core => }/confirm.js | 0 modules/ui/{core => }/conflicts.js | 6 +- modules/ui/{core => }/contributors.js | 2 +- modules/ui/{core/index.js => core.js} | 0 modules/ui/{core => }/disclosure.js | 0 modules/ui/{core => }/entity_editor.js | 6 +- modules/ui/{core => }/feature_info.js | 0 modules/ui/{core => }/feature_list.js | 10 +- modules/ui/{preset => fields}/access.js | 0 modules/ui/{preset => fields}/address.js | 0 modules/ui/{preset => fields}/check.js | 0 modules/ui/{preset => fields}/combo.js | 0 modules/ui/{preset => fields}/cycleway.js | 0 modules/ui/{preset => fields}/index.js | 2 +- modules/ui/{preset => fields}/input.js | 0 modules/ui/{preset => fields}/lanes.js | 0 modules/ui/{preset => fields}/localized.js | 0 modules/ui/{preset => fields}/maxspeed.js | 0 modules/ui/{preset => fields}/radio.js | 0 modules/ui/{preset => fields}/restrictions.js | 0 modules/ui/{preset => fields}/textarea.js | 0 modules/ui/{preset => fields}/wikipedia.js | 0 modules/ui/{core => }/flash.js | 0 modules/ui/{core => }/full_screen.js | 0 modules/ui/{core => }/geolocate.js | 6 +- modules/ui/{core => }/help.js | 2 +- modules/ui/index.js | 101 +++++++++--------- modules/ui/{core => }/info.js | 2 +- modules/ui/{core => }/inspector.js | 0 modules/ui/{core => }/intro.js | 8 +- modules/ui/{core => }/lasso.js | 2 +- modules/ui/{core => }/loading.js | 0 modules/ui/{core => }/map_data.js | 2 +- modules/ui/{core => }/map_in_map.js | 8 +- modules/ui/{core => }/modal.js | 2 +- modules/ui/{core => }/modes.js | 4 +- modules/ui/{core => }/notice.js | 2 +- modules/ui/{core => }/preset.js | 8 +- modules/ui/{core => }/preset_icon.js | 2 +- modules/ui/{core => }/preset_list.js | 8 +- modules/ui/{core => }/radial_menu.js | 2 +- modules/ui/{core => }/raw_member_editor.js | 10 +- .../ui/{core => }/raw_membership_editor.js | 10 +- modules/ui/{core => }/raw_tag_editor.js | 2 +- modules/ui/{core => }/restore.js | 0 modules/ui/{core => }/save.js | 2 +- modules/ui/{core => }/scale.js | 2 +- modules/ui/{core => }/selection_list.js | 8 +- modules/ui/{core => }/sidebar.js | 0 modules/ui/{core => }/source_switch.js | 2 +- modules/ui/{core => }/spinner.js | 0 modules/ui/{core => }/splash.js | 0 modules/ui/{core => }/status.js | 0 modules/ui/{core => }/success.js | 2 +- modules/ui/{core => }/tag_reference.js | 2 +- modules/ui/{core => }/toggle.js | 0 modules/ui/{core => }/tooltipHtml.js | 0 modules/ui/{core => }/undo_redo.js | 2 +- modules/ui/{core => }/view_on_osm.js | 2 +- modules/ui/{core => }/zoom.js | 2 +- 65 files changed, 123 insertions(+), 124 deletions(-) rename modules/ui/{core => }/account.js (98%) rename modules/ui/{core => }/attribution.js (100%) rename modules/ui/{core => }/background.js (98%) rename modules/ui/{core => }/cmd.js (100%) rename modules/ui/{core => }/commit.js (98%) rename modules/ui/{core => }/confirm.js (100%) rename modules/ui/{core => }/conflicts.js (98%) rename modules/ui/{core => }/contributors.js (98%) rename modules/ui/{core/index.js => core.js} (100%) rename modules/ui/{core => }/disclosure.js (100%) rename modules/ui/{core => }/entity_editor.js (98%) rename modules/ui/{core => }/feature_info.js (100%) rename modules/ui/{core => }/feature_list.js (97%) rename modules/ui/{preset => fields}/access.js (100%) rename modules/ui/{preset => fields}/address.js (100%) rename modules/ui/{preset => fields}/check.js (100%) rename modules/ui/{preset => fields}/combo.js (100%) rename modules/ui/{preset => fields}/cycleway.js (100%) rename modules/ui/{preset => fields}/index.js (97%) rename modules/ui/{preset => fields}/input.js (100%) rename modules/ui/{preset => fields}/lanes.js (100%) rename modules/ui/{preset => fields}/localized.js (100%) rename modules/ui/{preset => fields}/maxspeed.js (100%) rename modules/ui/{preset => fields}/radio.js (100%) rename modules/ui/{preset => fields}/restrictions.js (100%) rename modules/ui/{preset => fields}/textarea.js (100%) rename modules/ui/{preset => fields}/wikipedia.js (100%) rename modules/ui/{core => }/flash.js (100%) rename modules/ui/{core => }/full_screen.js (100%) rename modules/ui/{core => }/geolocate.js (92%) rename modules/ui/{core => }/help.js (99%) rename modules/ui/{core => }/info.js (99%) rename modules/ui/{core => }/inspector.js (100%) rename modules/ui/{core => }/intro.js (97%) rename modules/ui/{core => }/lasso.js (96%) rename modules/ui/{core => }/loading.js (100%) rename modules/ui/{core => }/map_data.js (99%) rename modules/ui/{core => }/map_in_map.js (97%) rename modules/ui/{core => }/modal.js (97%) rename modules/ui/{core => }/modes.js (95%) rename modules/ui/{core => }/notice.js (94%) rename modules/ui/{core => }/preset.js (97%) rename modules/ui/{core => }/preset_icon.js (98%) rename modules/ui/{core => }/preset_list.js (97%) rename modules/ui/{core => }/radial_menu.js (98%) rename modules/ui/{core => }/raw_member_editor.js (94%) rename modules/ui/{core => }/raw_membership_editor.js (97%) rename modules/ui/{core => }/raw_tag_editor.js (99%) rename modules/ui/{core => }/restore.js (100%) rename modules/ui/{core => }/save.js (97%) rename modules/ui/{core => }/scale.js (97%) rename modules/ui/{core => }/selection_list.js (92%) rename modules/ui/{core => }/sidebar.js (100%) rename modules/ui/{core => }/source_switch.js (95%) rename modules/ui/{core => }/spinner.js (100%) rename modules/ui/{core => }/splash.js (100%) rename modules/ui/{core => }/status.js (100%) rename modules/ui/{core => }/success.js (98%) rename modules/ui/{core => }/tag_reference.js (99%) rename modules/ui/{core => }/toggle.js (100%) rename modules/ui/{core => }/tooltipHtml.js (100%) rename modules/ui/{core => }/undo_redo.js (98%) rename modules/ui/{core => }/view_on_osm.js (95%) rename modules/ui/{core => }/zoom.js (98%) diff --git a/modules/ui/core/account.js b/modules/ui/account.js similarity index 98% rename from modules/ui/core/account.js rename to modules/ui/account.js index 00fac215e..e95455b51 100644 --- a/modules/ui/core/account.js +++ b/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(); diff --git a/modules/ui/core/attribution.js b/modules/ui/attribution.js similarity index 100% rename from modules/ui/core/attribution.js rename to modules/ui/attribution.js diff --git a/modules/ui/core/background.js b/modules/ui/background.js similarity index 98% rename from modules/ui/core/background.js rename to modules/ui/background.js index 0dbe3a546..914352f7e 100644 --- a/modules/ui/core/background.js +++ b/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'; diff --git a/modules/ui/core/cmd.js b/modules/ui/cmd.js similarity index 100% rename from modules/ui/core/cmd.js rename to modules/ui/cmd.js diff --git a/modules/ui/core/commit.js b/modules/ui/commit.js similarity index 98% rename from modules/ui/core/commit.js rename to modules/ui/commit.js index 2faed07fb..35f32dbf0 100644 --- a/modules/ui/core/commit.js +++ b/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'); diff --git a/modules/ui/core/confirm.js b/modules/ui/confirm.js similarity index 100% rename from modules/ui/core/confirm.js rename to modules/ui/confirm.js diff --git a/modules/ui/core/conflicts.js b/modules/ui/conflicts.js similarity index 98% rename from modules/ui/core/conflicts.js rename to modules/ui/conflicts.js index 06ba37e64..43b091151 100644 --- a/modules/ui/core/conflicts.js +++ b/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; diff --git a/modules/ui/core/contributors.js b/modules/ui/contributors.js similarity index 98% rename from modules/ui/core/contributors.js rename to modules/ui/contributors.js index 163ac37a7..f78248c0f 100644 --- a/modules/ui/core/contributors.js +++ b/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, diff --git a/modules/ui/core/index.js b/modules/ui/core.js similarity index 100% rename from modules/ui/core/index.js rename to modules/ui/core.js diff --git a/modules/ui/core/disclosure.js b/modules/ui/disclosure.js similarity index 100% rename from modules/ui/core/disclosure.js rename to modules/ui/disclosure.js diff --git a/modules/ui/core/entity_editor.js b/modules/ui/entity_editor.js similarity index 98% rename from modules/ui/core/entity_editor.js rename to modules/ui/entity_editor.js index 44a8547a6..1c24713e1 100644 --- a/modules/ui/core/entity_editor.js +++ b/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'; diff --git a/modules/ui/core/feature_info.js b/modules/ui/feature_info.js similarity index 100% rename from modules/ui/core/feature_info.js rename to modules/ui/feature_info.js diff --git a/modules/ui/core/feature_list.js b/modules/ui/feature_list.js similarity index 97% rename from modules/ui/core/feature_list.js rename to modules/ui/feature_list.js index a2df473ef..d95126920 100644 --- a/modules/ui/core/feature_list.js +++ b/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) { diff --git a/modules/ui/preset/access.js b/modules/ui/fields/access.js similarity index 100% rename from modules/ui/preset/access.js rename to modules/ui/fields/access.js diff --git a/modules/ui/preset/address.js b/modules/ui/fields/address.js similarity index 100% rename from modules/ui/preset/address.js rename to modules/ui/fields/address.js diff --git a/modules/ui/preset/check.js b/modules/ui/fields/check.js similarity index 100% rename from modules/ui/preset/check.js rename to modules/ui/fields/check.js diff --git a/modules/ui/preset/combo.js b/modules/ui/fields/combo.js similarity index 100% rename from modules/ui/preset/combo.js rename to modules/ui/fields/combo.js diff --git a/modules/ui/preset/cycleway.js b/modules/ui/fields/cycleway.js similarity index 100% rename from modules/ui/preset/cycleway.js rename to modules/ui/fields/cycleway.js diff --git a/modules/ui/preset/index.js b/modules/ui/fields/index.js similarity index 97% rename from modules/ui/preset/index.js rename to modules/ui/fields/index.js index 5f9464748..20f63ea29 100644 --- a/modules/ui/preset/index.js +++ b/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, diff --git a/modules/ui/preset/input.js b/modules/ui/fields/input.js similarity index 100% rename from modules/ui/preset/input.js rename to modules/ui/fields/input.js diff --git a/modules/ui/preset/lanes.js b/modules/ui/fields/lanes.js similarity index 100% rename from modules/ui/preset/lanes.js rename to modules/ui/fields/lanes.js diff --git a/modules/ui/preset/localized.js b/modules/ui/fields/localized.js similarity index 100% rename from modules/ui/preset/localized.js rename to modules/ui/fields/localized.js diff --git a/modules/ui/preset/maxspeed.js b/modules/ui/fields/maxspeed.js similarity index 100% rename from modules/ui/preset/maxspeed.js rename to modules/ui/fields/maxspeed.js diff --git a/modules/ui/preset/radio.js b/modules/ui/fields/radio.js similarity index 100% rename from modules/ui/preset/radio.js rename to modules/ui/fields/radio.js diff --git a/modules/ui/preset/restrictions.js b/modules/ui/fields/restrictions.js similarity index 100% rename from modules/ui/preset/restrictions.js rename to modules/ui/fields/restrictions.js diff --git a/modules/ui/preset/textarea.js b/modules/ui/fields/textarea.js similarity index 100% rename from modules/ui/preset/textarea.js rename to modules/ui/fields/textarea.js diff --git a/modules/ui/preset/wikipedia.js b/modules/ui/fields/wikipedia.js similarity index 100% rename from modules/ui/preset/wikipedia.js rename to modules/ui/fields/wikipedia.js diff --git a/modules/ui/core/flash.js b/modules/ui/flash.js similarity index 100% rename from modules/ui/core/flash.js rename to modules/ui/flash.js diff --git a/modules/ui/core/full_screen.js b/modules/ui/full_screen.js similarity index 100% rename from modules/ui/core/full_screen.js rename to modules/ui/full_screen.js diff --git a/modules/ui/core/geolocate.js b/modules/ui/geolocate.js similarity index 92% rename from modules/ui/core/geolocate.js rename to modules/ui/geolocate.js index 93086c58d..cbcebefc2 100644 --- a/modules/ui/core/geolocate.js +++ b/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) { diff --git a/modules/ui/core/help.js b/modules/ui/help.js similarity index 99% rename from modules/ui/core/help.js rename to modules/ui/help.js index 093f31359..921f55650 100644 --- a/modules/ui/core/help.js +++ b/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'; diff --git a/modules/ui/index.js b/modules/ui/index.js index 8646780f8..0c4c8d263 100644 --- a/modules/ui/index.js +++ b/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; diff --git a/modules/ui/core/info.js b/modules/ui/info.js similarity index 99% rename from modules/ui/core/info.js rename to modules/ui/info.js index b7c7267f8..11e19864f 100644 --- a/modules/ui/core/info.js +++ b/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) { diff --git a/modules/ui/core/inspector.js b/modules/ui/inspector.js similarity index 100% rename from modules/ui/core/inspector.js rename to modules/ui/inspector.js diff --git a/modules/ui/core/intro.js b/modules/ui/intro.js similarity index 97% rename from modules/ui/core/intro.js rename to modules/ui/intro.js index a5c1528ae..2d5dca852 100644 --- a/modules/ui/core/intro.js +++ b/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; diff --git a/modules/ui/core/lasso.js b/modules/ui/lasso.js similarity index 96% rename from modules/ui/core/lasso.js rename to modules/ui/lasso.js index 34d903406..3eb96b7ef 100644 --- a/modules/ui/core/lasso.js +++ b/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) { diff --git a/modules/ui/core/loading.js b/modules/ui/loading.js similarity index 100% rename from modules/ui/core/loading.js rename to modules/ui/loading.js diff --git a/modules/ui/core/map_data.js b/modules/ui/map_data.js similarity index 99% rename from modules/ui/core/map_data.js rename to modules/ui/map_data.js index 8fa8bef49..dbc27f482 100644 --- a/modules/ui/core/map_data.js +++ b/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) { diff --git a/modules/ui/core/map_in_map.js b/modules/ui/map_in_map.js similarity index 97% rename from modules/ui/core/map_in_map.js rename to modules/ui/map_in_map.js index cffb21a5a..47a4077b5 100644 --- a/modules/ui/core/map_in_map.js +++ b/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 = '/'; diff --git a/modules/ui/core/modal.js b/modules/ui/modal.js similarity index 97% rename from modules/ui/core/modal.js rename to modules/ui/modal.js index f8c9a415e..d6c4cf892 100644 --- a/modules/ui/core/modal.js +++ b/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'); diff --git a/modules/ui/core/modes.js b/modules/ui/modes.js similarity index 95% rename from modules/ui/core/modes.js rename to modules/ui/modes.js index e5c92c219..460cc2610 100644 --- a/modules/ui/core/modes.js +++ b/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) { diff --git a/modules/ui/core/notice.js b/modules/ui/notice.js similarity index 94% rename from modules/ui/core/notice.js rename to modules/ui/notice.js index 0518be7ec..38db1c701 100644 --- a/modules/ui/core/notice.js +++ b/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') diff --git a/modules/ui/core/preset.js b/modules/ui/preset.js similarity index 97% rename from modules/ui/core/preset.js rename to modules/ui/preset.js index 835b88f5f..eaa552730 100644 --- a/modules/ui/core/preset.js +++ b/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); diff --git a/modules/ui/core/preset_icon.js b/modules/ui/preset_icon.js similarity index 98% rename from modules/ui/core/preset_icon.js rename to modules/ui/preset_icon.js index 02a67e931..2b7310477 100644 --- a/modules/ui/core/preset_icon.js +++ b/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; diff --git a/modules/ui/core/preset_list.js b/modules/ui/preset_list.js similarity index 97% rename from modules/ui/core/preset_list.js rename to modules/ui/preset_list.js index 3ec423927..0d5972e59 100644 --- a/modules/ui/core/preset_list.js +++ b/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'; diff --git a/modules/ui/core/radial_menu.js b/modules/ui/radial_menu.js similarity index 98% rename from modules/ui/core/radial_menu.js rename to modules/ui/radial_menu.js index b82e3386b..675fe254e 100644 --- a/modules/ui/core/radial_menu.js +++ b/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) { diff --git a/modules/ui/core/raw_member_editor.js b/modules/ui/raw_member_editor.js similarity index 94% rename from modules/ui/core/raw_member_editor.js rename to modules/ui/raw_member_editor.js index 6211e29c5..8d2346843 100644 --- a/modules/ui/core/raw_member_editor.js +++ b/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) { diff --git a/modules/ui/core/raw_membership_editor.js b/modules/ui/raw_membership_editor.js similarity index 97% rename from modules/ui/core/raw_membership_editor.js rename to modules/ui/raw_membership_editor.js index 8eec9a1fb..b9ab7a268 100644 --- a/modules/ui/core/raw_membership_editor.js +++ b/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) { diff --git a/modules/ui/core/raw_tag_editor.js b/modules/ui/raw_tag_editor.js similarity index 99% rename from modules/ui/core/raw_tag_editor.js rename to modules/ui/raw_tag_editor.js index 6f71f26bf..9e4bdae58 100644 --- a/modules/ui/core/raw_tag_editor.js +++ b/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'; diff --git a/modules/ui/core/restore.js b/modules/ui/restore.js similarity index 100% rename from modules/ui/core/restore.js rename to modules/ui/restore.js diff --git a/modules/ui/core/save.js b/modules/ui/save.js similarity index 97% rename from modules/ui/core/save.js rename to modules/ui/save.js index b12bd1465..cb143dd35 100644 --- a/modules/ui/core/save.js +++ b/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'; diff --git a/modules/ui/core/scale.js b/modules/ui/scale.js similarity index 97% rename from modules/ui/core/scale.js rename to modules/ui/scale.js index 52f33aac8..8e2c592e0 100644 --- a/modules/ui/core/scale.js +++ b/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'), diff --git a/modules/ui/core/selection_list.js b/modules/ui/selection_list.js similarity index 92% rename from modules/ui/core/selection_list.js rename to modules/ui/selection_list.js index cafe714d5..e4f0523bc 100644 --- a/modules/ui/core/selection_list.js +++ b/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) { diff --git a/modules/ui/core/sidebar.js b/modules/ui/sidebar.js similarity index 100% rename from modules/ui/core/sidebar.js rename to modules/ui/sidebar.js diff --git a/modules/ui/core/source_switch.js b/modules/ui/source_switch.js similarity index 95% rename from modules/ui/core/source_switch.js rename to modules/ui/source_switch.js index 58c32d2f3..00e66dd67 100644 --- a/modules/ui/core/source_switch.js +++ b/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; diff --git a/modules/ui/core/spinner.js b/modules/ui/spinner.js similarity index 100% rename from modules/ui/core/spinner.js rename to modules/ui/spinner.js diff --git a/modules/ui/core/splash.js b/modules/ui/splash.js similarity index 100% rename from modules/ui/core/splash.js rename to modules/ui/splash.js diff --git a/modules/ui/core/status.js b/modules/ui/status.js similarity index 100% rename from modules/ui/core/status.js rename to modules/ui/status.js diff --git a/modules/ui/core/success.js b/modules/ui/success.js similarity index 98% rename from modules/ui/core/success.js rename to modules/ui/success.js index 3fb1bfd0c..ad084b96d 100644 --- a/modules/ui/core/success.js +++ b/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; diff --git a/modules/ui/core/tag_reference.js b/modules/ui/tag_reference.js similarity index 99% rename from modules/ui/core/tag_reference.js rename to modules/ui/tag_reference.js index c177b0529..4e34613b4 100644 --- a/modules/ui/core/tag_reference.js +++ b/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, diff --git a/modules/ui/core/toggle.js b/modules/ui/toggle.js similarity index 100% rename from modules/ui/core/toggle.js rename to modules/ui/toggle.js diff --git a/modules/ui/core/tooltipHtml.js b/modules/ui/tooltipHtml.js similarity index 100% rename from modules/ui/core/tooltipHtml.js rename to modules/ui/tooltipHtml.js diff --git a/modules/ui/core/undo_redo.js b/modules/ui/undo_redo.js similarity index 98% rename from modules/ui/core/undo_redo.js rename to modules/ui/undo_redo.js index 4dedbe789..9f082caf8 100644 --- a/modules/ui/core/undo_redo.js +++ b/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'; diff --git a/modules/ui/core/view_on_osm.js b/modules/ui/view_on_osm.js similarity index 95% rename from modules/ui/core/view_on_osm.js rename to modules/ui/view_on_osm.js index f1d0ca37b..6d065ba45 100644 --- a/modules/ui/core/view_on_osm.js +++ b/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; diff --git a/modules/ui/core/zoom.js b/modules/ui/zoom.js similarity index 98% rename from modules/ui/core/zoom.js rename to modules/ui/zoom.js index 3089b66e2..54e4285a4 100644 --- a/modules/ui/core/zoom.js +++ b/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';