Merge pull request #63 from pingwang2011/timob-11526

timob-11526: KitchenSink: Font's inconsistency in KitchenSink menue
appcelerator-developer-relations · Oct 18, 2012 · 9f696b9 · 9f696b9
2 parents ea346ae + 6f827cc
commit 9f696b9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/Resources/ui/common/BaseUIWindow.js b/Resources/ui/common/BaseUIWindow.js
@@ -50,7 +50,8 @@ function BaseUIWindow(title) {
 	// create table view
 	for (var i = 0; i < data.length; i++ ) {
 		var d = data[i];
-		if (d.touchEnabled) {
+		// On Android, if touchEnabled is not set explicitly, its value is undefined.
+		if (d.touchEnabled !== false) {
 			d.color = '#000';
 		}
 		d.font = {fontWeight:'bold'};

diff --git a/Resources/ui/common/MashupsWindow.js b/Resources/ui/common/MashupsWindow.js
@@ -27,7 +27,8 @@ function MashupsWindow(title) {
 	// create table view
 	for (var i = 0; i < data.length; i++ ) {
 		var d = data[i];
-		if (d.touchEnabled) {
+		// On Android, if touchEnabled is not set explicitly, its value is undefined.
+		if (d.touchEnabled !== false) {
 			d.color = '#000';
 		}
 		d.font = {fontWeight:'bold'};

diff --git a/Resources/ui/common/PhoneWindow.js b/Resources/ui/common/PhoneWindow.js
@@ -62,7 +62,8 @@ function PhoneWindow(title) {
 	// create table view
 	for (var i = 0; i < data.length; i++ ) {
 		var d = data[i];
-		if (d.touchEnabled) {
+		// On Android, if touchEnabled is not set explicitly, its value is undefined.
+		if (d.touchEnabled !== false) {
 			d.color = '#000';
 		}
 		d.font = {fontWeight:'bold'};

diff --git a/Resources/ui/common/PlatformWindow.js b/Resources/ui/common/PlatformWindow.js
@@ -44,7 +44,8 @@ function PlatformWindow(title) {
 	// create table view
 	for (var i = 0; i < data.length; i++ ) {
 		var d = data[i];
-		if (d.touchEnabled) {
+		// On Android, if touchEnabled is not set explicitly, its value is undefined.
+		if (d.touchEnabled !== false) {
 			d.color = '#000';
 		}
 		d.font = {fontWeight:'bold'};

diff --git a/Resources/ui/common/baseui/views.js b/Resources/ui/common/baseui/views.js
@@ -54,7 +54,8 @@ function views(_args) {
 	// create table view
 	for (var i = 0; i < data.length; i++ ) {
 		var d = data[i];
-		if (d.touchEnabled) {
+		// On Android, if touchEnabled is not set explicitly, its value is undefined.
+		if (d.touchEnabled !== false) {
 			d.color = '#000';
 		}
 		d.font = {fontWeight:'bold'};

diff --git a/Resources/ui/handheld/ios/baseui/dashboard.js b/Resources/ui/handheld/ios/baseui/dashboard.js
@@ -3,6 +3,7 @@ function dashboard(_args) {
 		title:_args.title
 	});
 	win.backgroundColor = '#13386c';
+	win.orientationModes = [Ti.UI.PORTRAIT];
 
 	var data = [];
 	var labels = ['account','cases','calls','contacts','emps','leads','meetings','opps','tasks'];