Merge pull request tidev#918 from ewanharris/ALOY-1640

feons · web-flow · commit 8d18ea9a4251 · 2019-01-15T10:04:28.000-08:00
feat: move TabbedBar to UI namespace
diff --git a/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemTypes.js b/Alloy/commands/compile/parsers/Alloy.Abstract.BarItemTypes.js
@@ -5,7 +5,8 @@ exports.parse = function(node, state) {
 		itemArrayDefinition: {
 			parents: [
 				'Ti.UI.ButtonBar',
-				'Ti.UI.iOS.TabbedBar'
+				'Ti.UI.iOS.TabbedBar',
+				'Ti.UI.TabbedBar'
 			],
 			children: [
 				'Alloy.Abstract.BarItemType'
diff --git a/Alloy/commands/compile/parsers/Ti.UI.TabbedBar.js b/Alloy/commands/compile/parsers/Ti.UI.TabbedBar.js
@@ -0,0 +1,14 @@
+const tiapp = require('../../../tiapp');
+const MIN_VERSION = '8.0.0';
+
+exports.parse = function(node, state) {
+	const tiappSdkVersion = tiapp.getSdkVersion();
+	if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION)) {
+		const platform = CU.getCompilerConfig().alloyConfig.platform;
+		if (platform !== 'ios') {
+			U.die(`Ti.UI.NavigationWindow for ${platform} requires Titanium ${MIN_VERSION}+`);
+		}
+		node.setAttribute('ns', 'Ti.UI.iOS');
+	}
+	return require('./Ti.UI.ButtonBar').parse(node, state);
+};
diff --git a/Alloy/commands/compile/parsers/Ti.UI.iOS.TabbedBar.js b/Alloy/commands/compile/parsers/Ti.UI.iOS.TabbedBar.js
diff --git a/Alloy/common/constants.js b/Alloy/common/constants.js
@@ -206,7 +206,6 @@ exports.IMPLICIT_NAMESPACES = {
 	DocumentViewer: NS_TI_UI_IOS,
 	LivePhotoView: NS_TI_UI_IOS,
 	SplitWindow: NS_TI_UI_IOS,
-	TabbedBar: NS_TI_UI_IOS,
 	PreviewContext: NS_TI_UI_IOS,
 	PreviewAction: NS_TI_UI_IOS,
 	PreviewActionGroup: NS_TI_UI_IOS,
