Merge pull request tidev#341 from appcelerator/pr/336

tonylukasavage · tonylukasavage · commit 20bf42f4bbbc · 2014-02-26T12:38:56.000-05:00
Shorthand XML for nav buttons
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract._ProxyProperty.js b/Alloy/commands/compile/parsers/Alloy.Abstract._ProxyProperty.js
@@ -1,7 +1,9 @@
 var _ = require('../../../lib/alloy/underscore')._,
 	U = require('../../../utils'),
 	CU = require('../compilerUtils'),
-	CONST = require('../../../common/constants');
+	CONST = require('../../../common/constants'),
+	logger = require('../../../logger'),
+	util = require('util');
 
 function fixDefinition(def) {
 	def = def || {};
@@ -18,6 +20,7 @@ exports.parse = function(node, state) {
 
 function parse(node, state, args) {
 	var def = fixDefinition(state.proxyPropertyDefinition),
+		proxyPropertyName = U.lcfirst(node.nodeName),
 		code = '',
 		proxy;
 
@@ -28,29 +31,45 @@ function parse(node, state, args) {
 		}
 	}
 
-	// process children
-	_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
-		var childArgs = CU.getParserArgs(child, state);
+	// standard proxy property handling
+	if(node.hasChildNodes()) {
 
-		// validate children
-		if (def.children.length > 0) {
-			if (!CU.validateNodeName(child, def.children)) {
-				U.dieWithNode(node, 'Child element must one of the following: [' + def.children.join(',') + ']');
-			}
-		}
+		// process children
+		_.each(U.XML.getElementsFromNodes(node.childNodes), function(child) {
+			var childArgs = CU.getParserArgs(child, state);
 
-		// generate proxy property
-		code += CU.generateNodeExtended(child, state, {
-			parent: {},
-			post: function(node, state, args) {
-				proxy = state.parent.symbol;
+			// validate children
+			if (def.children.length > 0) {
+				if (!CU.validateNodeName(child, def.children)) {
+					U.dieWithNode(node, 'Child element must one of the following: [' + def.children.join(',') + ']');
+				}
 			}
+
+			// generate proxy property
+			code += CU.generateNodeExtended(child, state, {
+				parent: {},
+				post: function(node, state, args) {
+					proxy = state.parent.symbol;
+				}
+			});
 		});
-	});
+
+	// explicitly create nav buttons from proxy property element
+	} else if (_.contains(['LeftNavButton', 'RightNavButton'], node.nodeName)) {
+		node.nodeName = 'Button';
+		var exState = _.extend(_.clone(state), { parent: {} });
+		var buttonState = require('./Ti.UI.Button').parse(node, exState);
+		code += buttonState.code;
+		proxy = buttonState.parent.symbol;
+
+	// fail if there's no children and its not nav buttons
+	} else {
+		U.dieWithNode(node, '<' + node.nodeName + '> requires a child element');
+	}
 
 	// assign proxy property to parent
 	code += (state.parent && state.parent.symbol ? state.parent.symbol : CONST.PARENT_SYMBOL_VAR) +
-		'.' + U.lcfirst(node.nodeName) + '=' + proxy + ';';
+			'.' + proxyPropertyName + '=' + proxy + ';';
 
 	return {
 		parent: {},
diff --git a/test/apps/testing/ALOY-714/controllers/index.js b/test/apps/testing/ALOY-714/controllers/index.js
@@ -0,0 +1,8 @@
+function doLeftClick() {
+  alert('Left button clicked');
+}
+function doRightClick() {
+  alert('Right button clicked');
+}
+
+$.index.open();
diff --git a/test/apps/testing/ALOY-714/styles/index.tss b/test/apps/testing/ALOY-714/styles/index.tss
@@ -0,0 +1,5 @@
+'#index': {
+	backgroundColor: '#fff',
+	fullscreen: false,
+	exitOnClose: true
+}
diff --git a/test/apps/testing/ALOY-714/views/index.xml b/test/apps/testing/ALOY-714/views/index.xml
@@ -0,0 +1,10 @@
+<Alloy>
+	<NavigationWindow>
+		<Window title="Proxy Shorthands">
+			<LeftNavButton>
+				<Button title="Left" onClick="doLeftClick"/>
+			</LeftNavButton>
+			<RightNavButton title="Right" onClick="doRightClick"/>
+		</Window>
+	</NavigationWindow>
+</Alloy>
