Merge pull request #7878 from cheekiatng/timob-20337-1

[TIMOB-20337] Parity: enabling run-on-main-thread
tidev · Mar 29, 2016 · 15af748 · 15af748
2 parents f196106 + 9efeaa7
commit 15af748
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/iphone/cli/commands/_build.js b/iphone/cli/commands/_build.js
@@ -2076,7 +2076,13 @@ iOSBuilder.prototype.initialize = function initialize() {
 	// Remove the debugHost/profilerHost check when we have debugging/profiling support with JSCore framework
 	// TIMOB-17892
 	this.currentBuildManifest.useJSCore = this.useJSCore = !this.debugHost && !this.profilerHost && (this.tiapp.ios['use-jscore-framework'] || false);
-	this.currentBuildManifest.runOnMainThread = this.runOnMainThread = (this.tiapp['run-on-main-thread'] === true);
+	// Remove this check on 6.0.0
+	if (this.tiapp.ios && (this.tiapp.ios.hasOwnProperty('run-on-main-thread'))) {
+		this.logger.info(__('run-on-main-thread no longer set in the <ios> section of the tiapp.xml. Use <property name="run-on-main-thread" type="bool">true</property> instead'));
+		this.currentBuildManifest.runOnMainThread = this.runOnMainThread = (this.tiapp.ios['run-on-main-thread'] === true);
+	} else {
+		this.currentBuildManifest.runOnMainThread = this.runOnMainThread = (this.tiapp.properties && this.tiapp.properties.hasOwnProperty('run-on-main-thread') && this.tiapp.properties['run-on-main-thread'].value || false);
+	}
 	this.currentBuildManifest.useAutoLayout = this.useAutoLayout = this.tiapp.ios && (this.tiapp.ios['use-autolayout'] === true);
 
 	this.moduleSearchPaths = [ this.projectDir, appc.fs.resolvePath(this.platformPath, '..', '..', '..', '..') ];

diff --git a/node_modules/titanium-sdk/lib/tiappxml.js b/node_modules/titanium-sdk/lib/tiappxml.js
diff --git a/node_modules/titanium-sdk/tests/resources/tiapp2.xml b/node_modules/titanium-sdk/tests/resources/tiapp2.xml