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

PresetGrid -> PresetList

Browse Source
This commit is contained in:
John Firebaugh
2013-05-21 18:11:08 -07:00
parent 9e4e794300
commit fb01868a3c
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@@ -93,7 +93,7 @@
<script src='js/id/ui/undo_redo.js'></script>
<script src='js/id/ui/zoom.js'></script>
<script src='js/id/ui/taglist.js'></script>
<script src='js/id/ui/preset_grid.js'></script>
<script src='js/id/ui/preset_list.js'></script>
<script src='js/id/ui/tag_editor.js'></script>
<script src='js/id/ui/preset/access.js'></script>

8
js/id/ui/inspector.js
View File

@@ -41,7 +41,7 @@ iD.ui.Inspector = function(context, entity) {
.append('div')
.classed('pane tag-pane', true);
var presetGrid = iD.ui.PresetGrid(context, entity)
var presetList = iD.ui.PresetList(context, entity)
.autofocus(newFeature)
.on('close', browse)
.on('choose', function(preset) {
@@ -64,18 +64,18 @@ iD.ui.Inspector = function(context, entity) {
.transition()
.style('right', right);
presetGrid
presetList
.current(preset)
.autofocus(true);
presetLayer.call(presetGrid);
presetLayer.call(presetList);
});
var tagless = _.without(Object.keys(entity.tags), 'area').length === 0;
if (tagless) {
panewrap.style('right', '-100%');
presetLayer.call(presetGrid);
presetLayer.call(presetList);
} else {
panewrap.style('right', '-0%');
tagLayer.call(tagEditor);

14
js/id/ui/preset_grid.js → js/id/ui/preset_list.js
View File

@@ -1,9 +1,9 @@
iD.ui.PresetGrid = function(context, entity) {
iD.ui.PresetList = function(context, entity) {
var event = d3.dispatch('choose', 'close'),
presets, current,
autofocus = false;
function presetGrid(selection) {
function presetList(selection) {
var geometry = entity.geometry(context.graph());
presets = context.presets().matchGeometry(geometry);
@@ -208,17 +208,17 @@ iD.ui.PresetGrid = function(context, entity) {
return item;
}
presetGrid.autofocus = function(_) {
presetList.autofocus = function(_) {
if (!arguments.length) return autofocus;
autofocus = _;
return presetGrid;
return presetList;
};
presetGrid.current = function(_) {
presetList.current = function(_) {
if (!arguments.length) return current;
current = _;
return presetGrid;
return presetList;
};
return d3.rebind(presetGrid, event, 'on');
return d3.rebind(presetList, event, 'on');
};

2
test/index.html
View File

@@ -89,7 +89,7 @@
<script src='../js/id/ui/undo_redo.js'></script>
<script src='../js/id/ui/zoom.js'></script>
<script src='../js/id/ui/taglist.js'></script>
<script src='../js/id/ui/preset_grid.js'></script>
<script src='../js/id/ui/preset_list.js'></script>
<script src='../js/id/ui/tag_editor.js'></script>
<script src='../js/id/ui/preset/access.js'></script>