Merge pull request #1890 from cb1kenobi/2_0_X

[TIMOB-8438] Moved deployType in the require.config so that it was available from Ti.App

mobileweb/src/config.js

@@ -2,6 +2,7 @@ var require = {
 	app: {
 		analytics: ${app_analytics | jsQuoteEscapeFilter},
 		copyright: "${app_copyright | jsQuoteEscapeFilter}",
+		deployType: "${deploy_type | jsQuoteEscapeFilter}",
 		description: "${app_description | jsQuoteEscapeFilter}",
 		guid: "${app_guid | jsQuoteEscapeFilter}",
 		id: "${app_name | jsQuoteEscapeFilter}",
@@ -11,7 +12,6 @@ var require = {
 		url: "${app_url | jsQuoteEscapeFilter}",
 		version: "${app_version | jsQuoteEscapeFilter}"
 	},
-	deployType: "${deploy_type | jsQuoteEscapeFilter}",
 	has: {
 		"declare-property-methods": true,
 		"js-btoa": function(g) {

mobileweb/titanium/Ti.js

@@ -18,6 +18,7 @@ define(
 
 	var global = window,
 		cfg = require.config,
+		deployType = cfg.app.deployType,
 		ver = cfg.ti.version,
 		is = require.is,
 		each = require.each,
@@ -69,7 +70,7 @@ define(
 		loadAppjs = Ti.deferStart();
 
 	// add has() tests
-	has.add("devmode", cfg.deployType === "development");
+	has.add("devmode", deployType === "development");
 
 	// Object.defineProperty() shim
 	if (!has("object-defineproperty")) {
@@ -395,7 +396,7 @@ define(
 					app_name: App.name,
 					oscpu: 1,
 					mac_addr: null,
-					deploytype: cfg.deployType,
+					deploytype: deployType,
 					ostype: Platform.osname,
 					osarch: null,
 					app_id: App.id,
@@ -408,7 +409,7 @@ define(
 			// app start event
 			analytics.add("ti.start", "ti.start", {
 				tz: (new Date()).getTimezoneOffset(),
-				deploytype: cfg.deployType,
+				deploytype: deployType,
 				os: Platform.osname,
 				osver: Platform.ostype,
 				version: cfg.tiVersion,

mobileweb/titanium/Ti/_/analytics.js

@@ -88,7 +88,7 @@ define(["Ti/_", "Ti/_/dom", "Ti/_/lang", "Ti/App", "Ti/Platform"], function(_, d
 						event: evt.evt,
 						seq: analyticsEventSeq++,
 						ver: "2",
-						deploytype: cfg.deployType,
+						deploytype: cfg.app.deployType,
 						sid: sessionId,
 						ts: evt.ts,
 						data: /(Array|Object)/.test(is(evt.data)) ? JSON.stringify(evt.data) : evt.data