diff --git a/js/lib/d3.combobox.js b/js/lib/d3.combobox.js index b34495e17..188dfc60b 100644 --- a/js/lib/d3.combobox.js +++ b/js/lib/d3.combobox.js @@ -1,4 +1,5 @@ import { rebind } from '../../modules/util/rebind'; +import 'd3-selection-multi'; import * as d3 from 'd3'; export function d3combobox() { @@ -71,7 +72,7 @@ export function d3combobox() { .insert('div', ':first-child') .datum(input.node()) .attr('class', 'combobox') - .style({ + .styles({ position: 'absolute', display: 'block', left: '0px' @@ -232,7 +233,7 @@ export function d3combobox() { var node = attachTo ? attachTo.node() : input.node(), rect = node.getBoundingClientRect(); - container.style({ + container.styles({ 'left': rect.left + 'px', 'width': rect.width + 'px', 'top': rect.height + rect.top + 'px' diff --git a/modules/svg/mapillary_images.js b/modules/svg/mapillary_images.js index 2e0a6b7f1..21528c3c0 100644 --- a/modules/svg/mapillary_images.js +++ b/modules/svg/mapillary_images.js @@ -40,7 +40,7 @@ export function MapillaryImages(projection, context, dispatch) { .transition() .duration(500) .style('opacity', 1) - .each('end', debouncedRedraw); + .on('end', debouncedRedraw); } function hideLayer() { @@ -55,7 +55,7 @@ export function MapillaryImages(projection, context, dispatch) { .transition() .duration(500) .style('opacity', 0) - .each('end', editOff); + .on('end', editOff); } function editOn() { diff --git a/modules/ui/background.js b/modules/ui/background.js index ae18cddad..b225aa806 100644 --- a/modules/ui/background.js +++ b/modules/ui/background.js @@ -305,7 +305,7 @@ export function Background(context) { .transition() .duration(200) .style('right', '-300px') - .each('end', function() { + .on('end', function() { d3.select(this).style('display', 'none'); }); selection.on('mousedown.background-inside', null); diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index 59895eae8..92db448f2 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -189,7 +189,7 @@ export function localized(field, context) { .style('margin-top', '10px') .style('max-height', '240px') .style('opacity', '1') - .each('end', function() { + .on('end', function() { d3.select(this) .style('max-height', '') .style('overflow', 'visible'); diff --git a/modules/ui/help.js b/modules/ui/help.js index 6fdcb3b25..ee5459a09 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -60,7 +60,7 @@ export function Help(context) { .transition() .duration(200) .style('right', '-500px') - .each('end', function() { + .on('end', function() { d3.select(this).style('display', 'none'); }); selection.on('mousedown.help-inside', null); diff --git a/modules/ui/info.js b/modules/ui/info.js index 508648ea2..27ae8d830 100644 --- a/modules/ui/info.js +++ b/modules/ui/info.js @@ -199,7 +199,7 @@ export function Info(context) { .transition() .duration(200) .style('opacity', 0) - .each('end', function() { + .on('end', function() { d3.select(this).style('display', 'none'); }); } else { diff --git a/modules/ui/map_data.js b/modules/ui/map_data.js index 85bbe3305..ba651c0c7 100644 --- a/modules/ui/map_data.js +++ b/modules/ui/map_data.js @@ -334,7 +334,7 @@ export function MapData(context) { .transition() .duration(200) .style('right', '-300px') - .each('end', function() { + .on('end', function() { d3.select(this).style('display', 'none'); }); selection.on('mousedown.map_data-inside', null); diff --git a/modules/ui/map_in_map.js b/modules/ui/map_in_map.js index 5d1df3f97..5f75fe4da 100644 --- a/modules/ui/map_in_map.js +++ b/modules/ui/map_in_map.js @@ -261,7 +261,7 @@ export function MapInMap(context) { .transition() .duration(200) .style('opacity', 0) - .each('end', function() { + .on('end', function() { d3.select(this).style('display', 'none'); }); } else { diff --git a/modules/ui/toggle.js b/modules/ui/toggle.js index 0d96933de..9ebd50527 100644 --- a/modules/ui/toggle.js +++ b/modules/ui/toggle.js @@ -10,7 +10,7 @@ export function Toggle(show, callback) { .classed('hide', false) .transition() .style('opacity', show ? 1 : 0) - .each('end', function() { + .on('end', function() { d3.select(this) .classed('hide', !show) .style('opacity', null); diff --git a/modules/util/curtain.js b/modules/util/curtain.js index 863ea75e7..9ed975311 100644 --- a/modules/util/curtain.js +++ b/modules/util/curtain.js @@ -1,5 +1,6 @@ import { getDimensions } from './dimensions'; import { rebind } from '../../modules/util/rebind'; +import 'd3-selection-multi'; import * as d3 from 'd3'; // Tooltips and svg mask used to highlight certain features @@ -14,7 +15,7 @@ export function d3curtain() { surface = selection.append('svg') .attr('id', 'curtain') - .style({ + .styles({ 'z-index': 1000, 'pointer-events': 'none', 'position': 'absolute',