CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-26 01:47:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into validation_and_change_perf

Browse Source
This commit is contained in:
Bryan Housel
2019-04-10 14:22:20 -04:00
parent 9100ce3ee4 df7a2f978e
commit 0a77a494aa
209 changed files with 1871 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/tools/add_favorite.js
+1 -1
View File
@@ -173,7 +173,7 @@ export function uiToolAddFavorite(context) {
buttonsEnter
.each(function(d) {
d3_select(this)
.call(uiPresetIcon()
.call(uiPresetIcon(context)
.geometry((d.geometry === 'point' && !d.preset.matchGeometry(d.geometry)) ? 'vertex' : d.geometry)
.preset(d.preset)
.sizeClass('small')
modules/ui/tools/add_recent.js
+1 -1
View File
@@ -210,7 +210,7 @@ export function uiToolAddRecent(context) {
buttonsEnter
.each(function(d) {
d3_select(this)
.call(uiPresetIcon()
.call(uiPresetIcon(context)
.geometry((d.geometry === 'point' && !d.preset.matchGeometry(d.geometry)) ? 'vertex' : d.geometry)
.preset(d.preset)
.sizeClass('small')
modules/ui/tools/search_add.js
+1 -1
View File
@@ -418,7 +418,7 @@ export function uiToolSearchAdd(context) {
row.each(function(d) {
d3_select(this).call(
uiPresetIcon()
uiPresetIcon(context)
.geometry(d.geometry)
.preset(d.preset || d.presets[0])
.sizeClass('small')
modules/ui/tools/undo_redo.js
+3 -1
View File
@@ -92,7 +92,9 @@ export function uiToolUndoRedo(context) {
function update() {
buttons
.property('disabled', !editable())
.classed('disabled', function(d) { return !d.annotation(); })
.classed('disabled', function(d) {
return !editable() || !d.annotation();
})
.each(function() {
var selection = d3_select(this);
if (selection.property('tooltipVisible')) {