s/maybe/computed, fixes ondras#24

Author: ondras

index.html

@@ -57,7 +57,7 @@ <h3>My Mind</h3>
 					<option value="">None</option>
 					<option value="yes">Yes</option>
 					<option value="no">No</option>
-					<option value="maybe">Auto</option>
+					<option value="computed">Autocompute</option>
 				</select>
 			</p>
 			<p>

my-mind.js

@@ -358,7 +358,10 @@ MM.Item.prototype.fromJSON = function(data) {
 	if (data.side) { this._side = data.side; }
 	if (data.color) { this._color = data.color; }
 	if (data.value) { this._value = data.value; }
-	if (data.status) { this._status = data.status; }
+	if (data.status) {
+		this._status = data.status;
+		if (this._status == "maybe") { this._status = "computed"; }
+	}
 	if (data.collapsed) { this.collapse(); }
 	if (data.layout) { this._layout = MM.Layout.getById(data.layout); }
 	if (data.shape) { this.setShape(MM.Shape.getById(data.shape)); }
@@ -683,7 +686,7 @@ MM.Item.prototype._updateStatus = function() {
 	this._dom.status.style.display = "";
 
 	var status = this._status;
-	if (this._status == "maybe") {
+	if (this._status == "computed") {
 		var childrenStatus = this._children.every(function(child) {
 			return (child.getComputedStatus() !== false);
 		});
@@ -1803,13 +1806,13 @@ MM.Command.No.execute = function() {
 	MM.App.action(action);
 }
 
-MM.Command.Maybe = Object.create(MM.Command, {
-	label: {value: "Maybe"},
-	keys: {value: [{charCode: "m".charCodeAt(0), ctrlKey:false}]}
+MM.Command.Computed = Object.create(MM.Command, {
+	label: {value: "Computed"},
+	keys: {value: [{charCode: "c".charCodeAt(0), ctrlKey:false}]}
 });
-MM.Command.Maybe.execute = function() {
+MM.Command.Computed.execute = function() {
 	var item = MM.App.current;
-	var status = (item.getStatus() == "maybe" ? null : "maybe");
+	var status = (item.getStatus() == "computed" ? null : "computed");
 	var action = new MM.Action.SetStatus(item, status);
 	MM.App.action(action);
 }
@@ -3525,7 +3528,7 @@ MM.UI.Help.prototype._build = function() {
 
 	var t = this._node.querySelector(".editing");
 	this._buildRow(t, "Value");
-	this._buildRow(t, "Yes", "No", "Maybe");
+	this._buildRow(t, "Yes", "No", "Computed");
 	this._buildRow(t, "Edit");
 	this._buildRow(t, "Newline");
 	this._buildRow(t, "Bold");

src/command.edit.js

@@ -138,13 +138,13 @@ MM.Command.No.execute = function() {
 	MM.App.action(action);
 }
 
-MM.Command.Maybe = Object.create(MM.Command, {
-	label: {value: "Maybe"},
-	keys: {value: [{charCode: "m".charCodeAt(0), ctrlKey:false}]}
+MM.Command.Computed = Object.create(MM.Command, {
+	label: {value: "Computed"},
+	keys: {value: [{charCode: "c".charCodeAt(0), ctrlKey:false}]}
 });
-MM.Command.Maybe.execute = function() {
+MM.Command.Computed.execute = function() {
 	var item = MM.App.current;
-	var status = (item.getStatus() == "maybe" ? null : "maybe");
+	var status = (item.getStatus() == "computed" ? null : "computed");
 	var action = new MM.Action.SetStatus(item, status);
 	MM.App.action(action);
 }

src/item.js

@@ -70,7 +70,10 @@ MM.Item.prototype.fromJSON = function(data) {
 	if (data.side) { this._side = data.side; }
 	if (data.color) { this._color = data.color; }
 	if (data.value) { this._value = data.value; }
-	if (data.status) { this._status = data.status; }
+	if (data.status) {
+		this._status = data.status;
+		if (this._status == "maybe") { this._status = "computed"; }
+	}
 	if (data.collapsed) { this.collapse(); }
 	if (data.layout) { this._layout = MM.Layout.getById(data.layout); }
 	if (data.shape) { this.setShape(MM.Shape.getById(data.shape)); }
@@ -395,7 +398,7 @@ MM.Item.prototype._updateStatus = function() {
 	this._dom.status.style.display = "";
 
 	var status = this._status;
-	if (this._status == "maybe") {
+	if (this._status == "computed") {
 		var childrenStatus = this._children.every(function(child) {
 			return (child.getComputedStatus() !== false);
 		});

src/ui.help.js

@@ -62,7 +62,7 @@ MM.UI.Help.prototype._build = function() {
 
 	var t = this._node.querySelector(".editing");
 	this._buildRow(t, "Value");
-	this._buildRow(t, "Yes", "No", "Maybe");
+	this._buildRow(t, "Yes", "No", "Computed");
 	this._buildRow(t, "Edit");
 	this._buildRow(t, "Newline");
 	this._buildRow(t, "Bold");