Merge pull request #5806 from cb1kenobi/timob-17165_3_3_X

[TIMOB-17165] Fixed bug with detecting Windows Phone devices when Window...
tidev · Jun 17, 2014 · 83b77f0 · 83b77f0
2 parents 5dd5730 + 503cba3
commit 83b77f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/mobileweb/cli/lib/info.js b/mobileweb/cli/lib/info.js
@@ -94,11 +94,15 @@ exports.render = function (logger, config, rpad, styleHeading, styleValue, style
 	if (data.windowsphone && Object.keys(data.windowsphone).some(function (ver) { return data.windowsphone[ver].supported; })) {
 		Object.keys(data.windowsphone).sort().forEach(function (ver) {
 			logger.log(styleHeading(__('Windows Phone v%s Devices & Emulators', ver)));
-			var devices = data.windowsphone[ver].devices
-			logger.log(Object.keys(devices).map(function (id) {
-				return '  ' + devices[id].cyan + '\n' +
-					'  ' + rpad('  ' + __('ID')) + ' = ' + styleValue(id);
-			}).join('\n') + '\n');
+			var devices = data.windowsphone[ver].devices;
+			if (devices) {
+				logger.log(Object.keys(devices).map(function (id) {
+					return '  ' + devices[id].cyan + '\n' +
+						'  ' + rpad('  ' + __('ID')) + ' = ' + styleValue(id);
+				}).join('\n') + '\n');
+			} else {
+				logger.log('  ' + __('None').grey + '\n');
+			}
 		});
 	} else {
 		logger.log(styleHeading(__('Windows Phone Devices & Emulators')));

diff --git a/node_modules/titanium-sdk/lib/windows.js b/node_modules/titanium-sdk/lib/windows.js