Make straighten/orthogonalize act like a single operation

- Display only one or the other in the radial menu
- Rename "Orthogonalize" to "Square"
- Use "S" as shortcut for both

Refs #1839
This commit is contained in:
John Firebaugh
2013-09-25 14:26:30 -07:00
parent d568e30cba
commit 690a04e538
7 changed files with 36 additions and 37 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
describe("iD.actions.Orthogonalize", function () {
var projection = d3.geo.mercator();
it("orthoganalizes a quad", function () {
it("orthogonalizes a quad", function () {
var graph = iD.Graph({
'a': iD.Node({id: 'a', loc: [0, 0]}),
'b': iD.Node({id: 'b', loc: [4, 0]}),
@@ -15,7 +15,7 @@ describe("iD.actions.Orthogonalize", function () {
expect(graph.entity('-').nodes).to.have.length(5);
});
it("orthoganalizes a triangle", function () {
it("orthogonalizes a triangle", function () {
var graph = iD.Graph({
'a': iD.Node({id: 'a', loc: [0, 0]}),
'b': iD.Node({id: 'b', loc: [3, 0]}),
@@ -28,7 +28,7 @@ describe("iD.actions.Orthogonalize", function () {
expect(graph.entity('-').nodes).to.have.length(4);
});
it("should not shrink skinny quads", function () {
it("preserves the shape of skinny quads", function () {
var tests = [
[
[-77.0339864831478, 38.8616391227204],