From baace6d09225e1a6ffec10c460d9d57074885402 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Wed, 7 Oct 2020 11:57:25 -0400 Subject: [PATCH] Update more code for D3 v6 --- modules/ui/conflicts.js | 12 ++++++------ modules/ui/field_help.js | 4 ++-- modules/ui/fields/combo.js | 7 +++++-- modules/ui/fields/localized.js | 6 +++--- modules/ui/init.js | 4 +++- modules/ui/panes/help.js | 16 +++++++++------- .../ui/sections/background_display_options.js | 11 +++++------ modules/ui/sections/raw_member_editor.js | 12 +++++++----- 8 files changed, 40 insertions(+), 32 deletions(-) diff --git a/modules/ui/conflicts.js b/modules/ui/conflicts.js index 1f66741e8..078a494d4 100644 --- a/modules/ui/conflicts.js +++ b/modules/ui/conflicts.js @@ -220,11 +220,11 @@ export function uiConflicts(context) { return (i === 0 && index === 0) || (i === 1 && index === _conflictList.length - 1) || null; }) - .on('click', function(d3_event, d, i) { + .on('click', function(d3_event, d) { d3_event.preventDefault(); var container = parent.selectAll('.conflict-container'); - var sign = (i === 0 ? -1 : 1); + var sign = (d === 'previous' ? -1 : 1); container .selectAll('.conflict') @@ -256,9 +256,9 @@ export function uiConflicts(context) { .append('input') .attr('type', 'radio') .attr('name', function(d) { return d.id; }) - .on('change', function(d3_event, d, i) { + .on('change', function(d3_event, d) { var ul = this.parentNode.parentNode.parentNode; - ul.__data__.chosen = i; + ul.__data__.chosen = d.id; choose(d3_event, ul, d); }); @@ -269,9 +269,9 @@ export function uiConflicts(context) { // update choicesEnter .merge(choices) - .each(function(d, i) { + .each(function(d) { var ul = this.parentNode; - if (ul.__data__.chosen === i) { + if (ul.__data__.chosen === d.id) { choose(null, ul, d); } }); diff --git a/modules/ui/field_help.js b/modules/ui/field_help.js index d1da38278..806fa04a5 100644 --- a/modules/ui/field_help.js +++ b/modules/ui/field_help.js @@ -219,10 +219,10 @@ export function uiFieldHelp(context, fieldName) { .append('div') .attr('class', 'field-help-nav-item') .html(function(d) { return d; }) - .on('click', function(d3_event, d, i) { + .on('click', function(d3_event, d) { d3_event.stopPropagation(); d3_event.preventDefault(); - clickHelp(i); + clickHelp(titles.indexOf(d)); }); enter diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js index e1fc4d6a0..8ff6d753a 100644 --- a/modules/ui/fields/combo.js +++ b/modules/ui/fields/combo.js @@ -575,7 +575,7 @@ export function uiFieldCombo(field, context) { }; targetIndex = null; }) - .on('drag', function(d3_event, d, index) { + .on('drag', function(d3_event) { var x = d3_event.x - dragOrigin.x, y = d3_event.y - dragOrigin.y; @@ -583,6 +583,8 @@ export function uiFieldCombo(field, context) { // don't display drag until dragging beyond a distance threshold Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)) <= 5) return; + var index = selection.nodes().indexOf(this); + d3_select(this) .classed('dragging', true); @@ -648,10 +650,11 @@ export function uiFieldCombo(field, context) { }); } }) - .on('end', function(d, index) { + .on('end', function() { if (!d3_select(this).classed('dragging')) { return; } + var index = selection.nodes().indexOf(this); d3_select(this) .classed('dragging', false); diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index f0f74f85d..fd50fd209 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -390,7 +390,7 @@ export function uiFieldLocalized(field, context) { } - function changeLang(d) { + function changeLang(d3_event, d) { var tags = {}; // make sure unrecognized suffixes are lowercase - #7156 @@ -422,7 +422,7 @@ export function uiFieldLocalized(field, context) { } - function changeValue(d) { + function changeValue(d3_event, d) { if (!d.lang) return; var value = context.cleanTagValue(utilGetSetValue(d3_select(this))) || undefined; @@ -508,7 +508,7 @@ export function uiFieldLocalized(field, context) { label .append('button') .attr('class', 'remove-icon-multilingual') - .on('click', function(d3_event, d, index) { + .on('click', function(d3_event, d) { if (field.locked()) return; d3_event.preventDefault(); diff --git a/modules/ui/init.js b/modules/ui/init.js index 81a26aac4..92defe275 100644 --- a/modules/ui/init.js +++ b/modules/ui/init.js @@ -343,7 +343,9 @@ export function uiInit(context) { }; d3_select(window) - .on('resize.editor', ui.onResize); + .on('resize.editor', function() { + ui.onResize(); + }); var panPixels = 80; diff --git a/modules/ui/panes/help.js b/modules/ui/panes/help.js index b0c0d9b5d..9b003cd21 100644 --- a/modules/ui/panes/help.js +++ b/modules/ui/panes/help.js @@ -279,8 +279,8 @@ export function uiPaneHelp(context) { helpPane.renderContent = function(content) { - function clickHelp(d3_event, d, i) { - if (d3_event) d3_event.preventDefault(); + function clickHelp(d, i) { + var rtl = (localizer.textDirection() === 'rtl'); content.property('scrollTop', 0); helpPane.selection().select('.pane-heading h2').html(d.title); @@ -308,7 +308,7 @@ export function uiPaneHelp(context) { .attr('class', 'next') .on('click', function(d3_event) { d3_event.preventDefault(); - clickHelp(null, docs[i + 1], i + 1); + clickHelp(docs[i + 1], i + 1); }); nextLink @@ -327,7 +327,7 @@ export function uiPaneHelp(context) { .attr('class', 'previous') .on('click', function(d3_event) { d3_event.preventDefault(); - clickHelp(null, docs[i - 1], i - 1); + clickHelp(docs[i - 1], i - 1); }); prevLink @@ -363,7 +363,10 @@ export function uiPaneHelp(context) { .append('a') .attr('href', '#') .html(function(d) { return d.title; }) - .on('click', clickHelp); + .on('click', function(d3_event, d) { + d3_event.preventDefault(); + clickHelp(d, docs.indexOf(d)); + }); var shortcuts = toc .append('li') @@ -411,8 +414,7 @@ export function uiPaneHelp(context) { .append('div') .attr('class', 'nav'); - clickHelp(null, docs[0], 0); - + clickHelp(docs[0], 0); }; return helpPane; diff --git a/modules/ui/sections/background_display_options.js b/modules/ui/sections/background_display_options.js index 0f2400195..f62871fb7 100644 --- a/modules/ui/sections/background_display_options.js +++ b/modules/ui/sections/background_display_options.js @@ -35,11 +35,7 @@ export function uiSectionBackgroundDisplayOptions(context) { return Math.max(min, Math.min(x, max)); } - function updateValue(d3_event, d, val) { - if (!val && d3_event && d3_event.target) { - val = d3_event.target.value; - } - + function updateValue(d, val) { val = clamp(val, _minVal, _maxVal); _options[d] = val; @@ -86,6 +82,9 @@ export function uiSectionBackgroundDisplayOptions(context) { .attr('step', '0.05') .on('input', function(d3_event, d) { var val = d3_select(this).property('value'); + if (!val && d3_event && d3_event.target) { + val = d3_event.target.value; + } updateValue(d, val); }); @@ -107,7 +106,7 @@ export function uiSectionBackgroundDisplayOptions(context) { .html(t.html('background.reset_all')) .on('click', function() { for (var i = 0; i < _sliders.length; i++) { - updateValue(_sliders[i],1); + updateValue(_sliders[i], 1); } }); diff --git a/modules/ui/sections/raw_member_editor.js b/modules/ui/sections/raw_member_editor.js index 871a9e0fc..da23790b0 100644 --- a/modules/ui/sections/raw_member_editor.js +++ b/modules/ui/sections/raw_member_editor.js @@ -274,7 +274,7 @@ export function uiSectionRawMemberEditor(context) { }; targetIndex = null; }) - .on('drag', function(d3_event, d, index) { + .on('drag', function(d3_event) { var x = d3_event.x - dragOrigin.x, y = d3_event.y - dragOrigin.y; @@ -282,6 +282,8 @@ export function uiSectionRawMemberEditor(context) { // don't display drag until dragging beyond a distance threshold Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)) <= 5) return; + var index = items.nodes().indexOf(this); + d3_select(this) .classed('dragging', true); @@ -306,11 +308,11 @@ export function uiSectionRawMemberEditor(context) { return null; }); }) - .on('end', function(d3_event, d, index) { + .on('end', function(d3_event, d) { - if (!d3_select(this).classed('dragging')) { - return; - } + if (!d3_select(this).classed('dragging')) return; + + var index = items.nodes().indexOf(this); d3_select(this) .classed('dragging', false);