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

Disallow favoriting of unsearchable presets

Browse Source 
Rename preset favorite button class and file
This commit is contained in:
Quincy Morgan
2019-03-22 09:20:18 -04:00
parent c7e375cbd7
commit e6bc7efb7f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/entity_editor.js
+2 -2
View File
@@ -14,7 +14,7 @@ import { tooltip } from '../util/tooltip';
import { actionChangeTags } from '../actions';
import { modeBrowse } from '../modes';
import { svgIcon } from '../svg';
import { uiPresetFavorite } from './preset_favorite';
import { uiPresetFavoriteButton } from './preset_favorite_button';
import { uiPresetIcon } from './preset_icon';
import { uiQuickLinks } from './quick_links';
import { uiRawMemberEditor } from './raw_member_editor';
@@ -341,7 +341,7 @@ export function uiEntityEditor(context) {
_tagReference = uiTagReference(_activePreset.reference(context.geometry(_entityID)), context)
.showing(false);
}
_presetFavorite = uiPresetFavorite(_activePreset, context.geometry(_entityID), context);
_presetFavorite = uiPresetFavoriteButton(_activePreset, context.geometry(_entityID), context);
return entityEditor;
};
modules/ui/preset_favorite.js → modules/ui/preset_favorite_button.js
+2 -2
View File
@@ -6,7 +6,7 @@ import {
import { t } from '../util/locale';
import { svgIcon } from '../svg';
export function uiPresetFavorite(preset, geom, context, klass) {
export function uiPresetFavoriteButton(preset, geom, context, klass) {
geom = context.presets().fallback(geom).id;
@@ -17,7 +17,7 @@ export function uiPresetFavorite(preset, geom, context, klass) {
presetFavorite.button = function(selection) {
var canFavorite = geom !== 'relation';
var canFavorite = geom !== 'relation' && preset.searchable !== false;
_button = selection.selectAll('.preset-favorite-button')
.data(canFavorite ? [0] : []);
modules/ui/search_add.js
+2 -2
View File
@@ -19,7 +19,7 @@ import { svgIcon } from '../svg/index';
import { tooltip } from '../util/tooltip';
import { uiTagReference } from './tag_reference';
import { uiTooltipHtml } from './tooltipHtml';
import { uiPresetFavorite } from './preset_favorite';
import { uiPresetFavoriteButton } from './preset_favorite_button';
import { uiPresetIcon } from './preset_icon';
import { utilKeybinding, utilNoAuto, utilRebind } from '../util';
@@ -437,7 +437,7 @@ export function uiSearchAdd(context) {
row.each(function(d) {
if (d.geometry) {
var presetFavorite = uiPresetFavorite(d.preset, d.geometry, context, 'accessory');
var presetFavorite = uiPresetFavoriteButton(d.preset, d.geometry, context, 'accessory');
d3_select(this).call(presetFavorite.button);
}
});