Merge pull request tidev#293 from pegli/TIMOB-15402

tonylukasavage · tonylukasavage · commit 194fdf752435 · 2014-02-05T18:29:11.000-05:00
[TIMOB-15402] Unable to add NavigationWindow to Popover.
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.ContentView.js b/Alloy/commands/compile/parsers/Alloy.Abstract.ContentView.js
@@ -0,0 +1,12 @@
+var _ = require('../../../lib/alloy/underscore')._;
+
+exports.parse = function(node, state) {
+	_.extend(state, {
+		proxyPropertyDefinition: {
+			parents: [
+				'Ti.UI.iPad.Popover'
+			]
+		}
+	});
+	return require('./Alloy.Abstract._ProxyProperty').parse(node, state);
+};
diff --git a/Alloy/common/constants.js b/Alloy/common/constants.js
@@ -151,6 +151,7 @@ exports.IMPLICIT_NAMESPACES = {
 	ButtonName: NS_ALLOY_ABSTRACT,
 	BarItemTypes: NS_ALLOY_ABSTRACT,
 	BarItemType: NS_ALLOY_ABSTRACT,
+	ContentView: NS_ALLOY_ABSTRACT,
 	CoverFlowImageTypes: NS_ALLOY_ABSTRACT,
 	CoverFlowImageType: NS_ALLOY_ABSTRACT,
 	FlexSpace: NS_ALLOY_ABSTRACT,
diff --git a/test/apps/ui/popover/controllers/index.js b/test/apps/ui/popover/controllers/index.js
@@ -1,7 +1,16 @@
 function openPopover() {
 	if (Ti.Platform.osname === 'ipad') {
 		var popover = Alloy.createController('popover').getView();
-		popover.show({view:$.button});
+		popover.show({view:$.button1});
+	} else {
+		alert('Popover only supported on iPad');
+	}
+}
+
+function openPopoverWithContentView() {
+	if (Ti.Platform.osname === 'ipad') {
+		var popover = Alloy.createController('popover_with_content_view').getView();
+		popover.show({view:$.button2});
 	} else {
 		alert('Popover only supported on iPad');
 	}
diff --git a/test/apps/ui/popover/controllers/popover_with_content_view.js b/test/apps/ui/popover/controllers/popover_with_content_view.js
@@ -0,0 +1,8 @@
+
+
+function open_window(e) {
+	var win = Ti.UI.createWindow({
+		backgroundColor: "blue"
+	});
+	$.navWindow.openWindow(win, { animated: true });
+}
diff --git a/test/apps/ui/popover/views/index.xml b/test/apps/ui/popover/views/index.xml
@@ -1,5 +1,6 @@
 <Alloy>
-	<Window>
-		<Button id="button" onClick="openPopover">popover</Button>
+	<Window layout="vertical">
+		<Button id="button1" onClick="openPopover" top="20">popover</Button>
+		<Button id="button2" onClick="openPopoverWithContentView">popover with content view</Button>
 	</Window>
 </Alloy>
diff --git a/test/apps/ui/popover/views/popover_with_content_view.xml b/test/apps/ui/popover/views/popover_with_content_view.xml
@@ -0,0 +1,14 @@
+<Alloy>
+	<Popover title="popover" height="300" width="250">
+		<ContentView>
+			<NavigationWindow id="navWindow">
+				<Window>
+					<RightNavButton>
+						<Button title="Open Window" onClick="open_window"/>
+					</RightNavButton>
+					<Label>This is a window in a popover</Label>
+				</Window>
+			</NavigationWindow>
+		</ContentView>
+	</Popover>
+</Alloy>
