From 8bc2f31967a1e66c03605dec5c73e07d0a88b86c Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 28 Apr 2015 17:18:02 -0600
Subject: [PATCH] * Minor changes to demo mode.

---
 core/view_controller.js                  |   1 +
 mods/art/demo_edit_text_view1.ans        | Bin 492 -> 781 bytes
 mods/art/{DEMOMAIN.ANS => demo_main.ans} | Bin
 mods/menu.json                           |  30 ++++++++++++++++-------
 4 files changed, 22 insertions(+), 9 deletions(-)
 rename mods/art/{DEMOMAIN.ANS => demo_main.ans} (100%)

diff --git a/core/view_controller.js b/core/view_controller.js
index 92c7e6d4..819adf64 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -459,6 +459,7 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 			}
 		}
 
+		Log.trace( { formValue : formValue, actionValue : actionValue }, 'Action match');
 		return true;
 	};
 
diff --git a/mods/art/demo_edit_text_view1.ans b/mods/art/demo_edit_text_view1.ans
index 8d380b9055eb69f963aed997e98a648d2806f8d1..8053f31521e8a3dc3aae4c3b7e41e7eb736c7f60 100644
GIT binary patch
delta 325
zcmYL^!AiqG5QY;Af`Rw~K^U*Kg)Kn^d(sf_Af?n?BzV|nN3)pS$nI9#Q(vHhk_Yoe
zdg&Xuo2EFo`9JpiXScnt<L`@gl*dF2A<D@(z7$i1TH9qL(#NFBz|^47ER=L$9AAs)
zFbD%n1=zXg(&!ctaT5kEa;V=$kf{~CJ1v*5ElIN3!|<uYYiBPiqzWihT;jjDzpo?v
zqYkgL+q;9AvJWZ?)J|ba1c^%nFB~g2fX|Xw*w&?!ES)*4J)MXsze>1<qL!L7RCvx{
uUYpXE>&0Af15`5T#PEizF!&kldiKvv<d2$(zdYF-d7kf2z0>B`Kl=mFeqIUy

delta 34
qcmeBWd&4|In=y8>7vsmt4ov!!bD63*vl$r}7#RZ?I3|B!k_7;{4+&fV

diff --git a/mods/art/DEMOMAIN.ANS b/mods/art/demo_main.ans
similarity index 100%
rename from mods/art/DEMOMAIN.ANS
rename to mods/art/demo_main.ans
diff --git a/mods/menu.json b/mods/menu.json
index 5a221dff..9c7aad6d 100644
--- a/mods/menu.json
+++ b/mods/menu.json
@@ -176,14 +176,18 @@
 		}
 	},
 	"demoMain" : {
-		"art" : "DEMOMAIN",
+		"art" : "demo_main",
 		"options" : { "cls" : true },
 		"form" : {
 			"0" : {
 				"VM1" : {
 					"mci" : {
 						"VM1" : {
-							"items" : [ "Edit Text View", "Other" ],
+							"items" : [
+								"Single Line Text Editing Views", 
+								"Spinner & Toggle Views",
+								"Other"
+							],
 							"focusTextStyle" : "U"
 						}
 					},
@@ -227,14 +231,14 @@
 						},
 						"BT5" : {
 							"width" : 8,
-							"text" : "Back",
-							"submit" : true
+							"text" : "< Back",
+							"submit" : [ "esc" ]
 						}
 					},
 					"submit" : {
 						"*" : [
 							{
-								"value" : 4,
+								"value" : 5,
 								"action" : "@menu:demoMain"
 							}
 						]
@@ -245,10 +249,18 @@
 	}
 	/*
 	:TODO: conceptual simplified menus -- actions/etc. without forms
-	"thing" : {
-		"mci" : {
-			"ET1" : {
-				"action" : "@menu:stuff"
+
+	{
+		"myMenu" : {
+			"art" : "MENUART",
+			"mci" : {	//	lack of "form": direct to form:0 {}
+				"VM1" : {
+					"items" : [ "Hello", "Goodbye" ],
+					"action" : "@method:someMethod"	//	implies  { "submit" : true }
+				},
+				"submit" : {
+					//	alternate form with filters
+				}
 			}
 		}
 	}