CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-14 13:18:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert lodah-es and d3 to named imports for ui

Browse Source
This commit is contained in:
Bryan Housel
2017-09-26 11:22:43 -04:00
parent 31aec5743c
commit 3d13620705
54 changed files with 621 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/commit.js
+18 -12
View File
@@ -1,5 +1,11 @@
import * as d3 from 'd3';
import _ from 'lodash';
import _clone from 'lodash-es/clone';
import _forEach from 'lodash-es/forEach';
import _isEqual from 'lodash-es/isEqual';
import _unionBy from 'lodash-es/unionBy';
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { select as d3_select } from 'd3-selection';
import { t } from '../util/locale';
import { osmChangeset } from '../osm';
import { uiChangesetEditor } from './changeset_editor';
@@ -22,7 +28,7 @@ var readOnlyTags = [
export function uiCommit(context) {
var dispatch = d3.dispatch('cancel', 'save'),
var dispatch = d3_dispatch('cancel', 'save'),
userDetails,
_selection;
@@ -72,7 +78,7 @@ export function uiCommit(context) {
changeset = new osmChangeset({ tags: tags });
}
tags = _.clone(changeset.tags);
tags = _clone(changeset.tags);
var header = selection.selectAll('.header')
.data([0]);
@@ -133,7 +139,7 @@ export function uiCommit(context) {
osm.userDetails(function(err, user) {
if (err) return;
var userLink = d3.select(document.createElement('div'));
var userLink = d3_select(document.createElement('div'));
userDetails = user;
@@ -222,7 +228,7 @@ export function uiCommit(context) {
buttonSection.selectAll('.save-button')
.attr('disabled', function() {
var n = d3.select('#preset-input-comment').node();
var n = d3_select('#preset-input-comment').node();
return (n && n.value.length) ? null : true;
})
.on('click.save', function() {
@@ -244,7 +250,7 @@ export function uiCommit(context) {
.call(rawTagEditor
.expanded(expanded)
.readOnlyTags(readOnlyTags)
.tags(_.clone(changeset.tags))
.tags(_clone(changeset.tags))
);
@@ -262,7 +268,7 @@ export function uiCommit(context) {
.call(rawTagEditor
.expanded(expanded)
.readOnlyTags(readOnlyTags)
.tags(_.clone(changeset.tags))
.tags(_clone(changeset.tags))
);
}
}
@@ -295,7 +301,7 @@ export function uiCommit(context) {
context.storage('hashtags', null); // always remove stored hashtags - #4304
if (commentOnly) { inHashTags = null; } // optionally override hashtags field
}
return _.unionBy(inComment, inHashTags, function (s) {
return _unionBy(inComment, inHashTags, function (s) {
return s.toLowerCase();
});
@@ -329,9 +335,9 @@ export function uiCommit(context) {
function updateChangeset(changed, onInput) {
var tags = _.clone(changeset.tags);
var tags = _clone(changeset.tags);
_.forEach(changed, function(v, k) {
_forEach(changed, function(v, k) {
k = k.trim().substr(0, 255);
if (readOnlyTags.indexOf(k) !== -1) return;
@@ -386,7 +392,7 @@ export function uiCommit(context) {
delete tags.changesets_count;
}
if (!_.isEqual(changeset.tags, tags)) {
if (!_isEqual(changeset.tags, tags)) {
changeset = changeset.update({ tags: tags });
}
}