CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 22:03:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

add history.numChanges method.

Browse Source 
Use hasChanges/numChanges to toggle Save button and show confirmation dialog when navigating away from page.
This commit is contained in:
Brandon Liu
2013-01-19 22:53:00 -08:00
parent d83ec7f1eb
commit ded802049a
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/graph/history.js
+6 -2
View File
@@ -110,9 +110,13 @@ iD.History = function() {
},
hasChanges: function() {
return !!d3.sum(d3.values(this.changes()).map(function(c) {
return !!this.numChanges();
},
numChanges: function() {
return d3.sum(d3.values(this.changes()).map(function(c) {
return c.length;
}));;
}));
},
imagery_used: function(source) {
js/id/id.js
+1 -7
View File
@@ -98,13 +98,7 @@ window.iD = function(container) {
.call(iD.ui.save().map(map).controller(controller));
history.on('change.warn-unload', function() {
var changes = history.changes(),
has_changes = !!d3.sum(d3.values(changes).map(function(c) {
return c.length;
}));
window.onbeforeunload = has_changes ? function() {
window.onbeforeunload = history.hasChanges() ? function() {
return 'You have unsaved changes.';
} : null;
});
js/id/ui/save.js
+5 -12
View File
@@ -42,12 +42,8 @@ iD.ui.save = function() {
}
});
}
var changes = history.changes();
var has_changes = d3.sum(d3.values(changes).map(function(c) {
return c.length;
})) > 0;
if (has_changes) {
if (history.hasChanges()) {
connection.authenticate(function(err) {
var modal = iD.ui.modal();
var changes = history.changes();
@@ -77,16 +73,13 @@ iD.ui.save = function() {
.attr('class', 'count');
history.on('change.save-button', function() {
var changes = history.changes(),
num_changes = d3.sum(d3.values(changes).map(function(c) {
return c.length;
}));
var hasChanges = history.hasChanges();
selection
.property('disabled', num_changes === 0)
.classed('has-count', num_changes > 0)
.property('disabled', !hasChanges)
.classed('has-count', hasChanges)
.select('span.count')
.text(num_changes);
.text(history.numChanges());
});
}
test/spec/graph/history.js
+17 -1
View File
@@ -133,11 +133,27 @@ describe("iD.History", function () {
expect(history.hasChanges()).to.eql(true);
});
it("is false when any of change's values are empty", function() {
it("is false when all of change's values are empty", function() {
expect(history.hasChanges()).to.eql(false);
});
});
describe("#numChanges", function() {
it("is 0 when there are no changes", function() {
expect(history.numChanges()).to.eql(0);
});
it("is the sum of all types of changes", function() {
var node1 = iD.Node({id: "n1"}),
node2 = iD.Node();
history.merge(iD.Graph([node1]));
history.perform(function (graph) { return graph.remove(node1); });
expect(history.numChanges()).to.eql(1);
history.perform(function (graph) { return graph.replace(node2); });
expect(history.numChanges()).to.eql(2);
});
});
describe("#reset", function () {
it("clears the version stack", function () {
history.perform(action, "annotation");