CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-31 04:09:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Start UI refactor

Browse Source
This commit is contained in:
Tom MacWright
2012-10-18 12:37:01 -04:00
parent fb3fb4080b
commit 4182cc1240
18 changed files with 286 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/iD/controller/shape/DrawWay.js
+19 -19
View File
@@ -28,20 +28,21 @@ declare("iD.controller.shape.DrawWay", [iD.controller.ControllerState], {
constructor: function(way) {
this.way = way;
},
enterState: function() {
this.wayUI = this.controller.map.getUI(this.way);
this.wayUI.setStateClass('selected');
this.wayUI.setStateClass('shownodes');
this.wayUI.redraw();
this.controller.stepper.highlight('draw');
},
exitState: function() {
this.controller.map.clearElastic();
this.wayUI.resetStateClass('selected');
this.wayUI.resetStateClass('shownodes');
this.wayUI.redraw();
},
},
enterState: function() {
this.wayUI = this.controller.map.getUI(this.way);
this.wayUI.setStateClass('selected')
.setStateClass('shownodes')
.redraw();
this.controller.stepper.step(1);
},
exitState: function() {
this.controller.map.clearElastic();
this.wayUI
.resetStateClass('selected')
.resetStateClass('shownodes')
.redraw();
},
processMouseEvent:function(event,entityUI) {
var entity=entityUI ? entityUI.entity : null;
@@ -99,12 +100,12 @@ declare("iD.controller.shape.DrawWay", [iD.controller.ControllerState], {
// Click on node
if (entity === this.getDrawingNode()) {
// Double-click, so complete drawing
this.controller.stepper.highlight('tag');
this.controller.stepper.step(2);
return new iD.controller.edit.SelectedWay(this.way, null);
} else if (entity === this.getStartNode()) {
// Start of this way, so complete drawing
this.appendNode(entity, this.undoAdder() );
this.controller.stepper.highlight('tag');
this.controller.stepper.step(2);
return new iD.controller.edit.SelectedWay(this.way, null);
} else {
// Add to way
@@ -147,11 +148,11 @@ declare("iD.controller.shape.DrawWay", [iD.controller.ControllerState], {
},
getDrawingNode:function() {
return (this.editEnd ? this.way.nodes[this.way.length()-1] : this.way.nodes[0]);
return (this.editEnd ? this.way.nodes[this.way.nodes.length - 1] : this.way.nodes[0]);
},
getStartNode:function() {
return (this.editEnd ? this.way.nodes[0] : this.way.nodes[this.way.length()-1]);
return (this.editEnd ? this.way.nodes[0] : this.way.nodes[this.way.node.length - 1]);
},
appendNode:function(node, performAction) {
@@ -168,7 +169,6 @@ declare("iD.controller.shape.DrawWay", [iD.controller.ControllerState], {
this.appendNode(node, lang.hitch(undo,undo.push));
return node;
}
});
// ----------------------------------------------------------------------
js/iD/controller/shape/NoSelection.js
+4 -8
View File
@@ -36,11 +36,7 @@ declare("iD.controller.shape.NoSelection", [iD.controller.ControllerState], {
enterState: function() {
this.controller.map.div.className = 'state-drawing';
this.controller.stepper.setSteps({
begin: "Click anywhere on the map to start drawing",
draw: "Keep clicking to add each point then double-click when you're done",
tag: "Set the type of the road or shape"
}, ['begin', 'draw', 'tag']).highlight('begin');
this.controller.stepper.show().step(0);
},
processMouseEvent:function(event,entityUI) {
@@ -53,9 +49,9 @@ declare("iD.controller.shape.NoSelection", [iD.controller.ControllerState], {
case 'node':
// Click to select a node
var ways=entity.parentWays();
if (ways.length==0) { return new iD.controller.shape.SelectedPOINode(entity); }
// else { return new iD.controller.shape.SelectedWayNode(entity,ways[0]); }
// ** FIXME: ^^^ the above should start a new branching way, not select the node
if (!ways.length) { return new iD.controller.shape.SelectedPOINode(entity); }
// else { return new iD.controller.shape.SelectedWayNode(entity,ways[0]); }
// ** FIXME: ^^^ the above should start a new branching way, not select the node
return this;
case 'way':
// Click to select a way