moved to new repo

davglass · Jun 16, 2009 · 94f01a2 · 94f01a2
1 parent 852cb87
commit 94f01a2
Show file tree

Hide file tree

Showing 19 changed files with 315 additions and 180 deletions.
diff --git a/README b/README
@@ -2,9 +2,9 @@ Titanium Developer
 
 This is the Titanium Developer application for the Titanium Runtime. 
 
-More information on Titanium can be found at http://www.appcelerator.com
+More information on Titanium can be found at http://titaniumapp.com
 
 
 
 Copyright(c) 2008-2009 by Appcelerator, Inc. All Rights Reserved.
-Please see the LICENSE.txt file for more information on the license.
+Please see the LICENSE file for more information on the license.
diff --git a/Resources/default_app_logo.png b/Resources/default_app_logo.png
diff --git a/Resources/feedback.html b/Resources/feedback.html
@@ -58,7 +58,7 @@
 				TiDev.messageArea.expand();
 				TiDev.messageArea.setMessage('Submitting feedback...');
 
-				TiDev.invokeCloudService(TiDev.feedbackURL,{'data':$('feedback').val()},'POST', function(data)
+				TiDev.invokeCloudService(TiDev.feedbackURL,{'data':$('#feedback').val()},'POST', function(data)
 				{
 					if (data.success == true)
 					{
@@ -67,6 +67,7 @@
 						{
 							TiDev.messageArea.collapse();
 							TiDev.messageArea.showDefaultMessage();
+							Titanium.UI.currentWindow.close();
 						},1000);						
 					}
 					else

diff --git a/Resources/images/cloud_usage.png b/Resources/images/cloud_usage.png
diff --git a/Resources/js/index.js b/Resources/js/index.js
@@ -456,19 +456,21 @@ TiDev.init = function()
 Titanium.UpdateManager.onupdate = function(details)
 {
 	TiDev.messageArea.setCollapsedWidth('390px');
-	TiDev.messageArea.setDefaultMessage('New Titanium Developer available (version ' + details.version + '). <span id="sdk_download_link" style="text-decoration:underline">Click to download</span>');
-	TiDev.messageArea.showDefaultMessage();
-
-	$('#sdk_download_link').click(function()
+	TiDev.messageArea.setDefaultMessage('New Titanium Developer available (version ' + details.version + '). <span id="sdk_download_link" style="text-decoration:underline">Click to download</span>',
+	function()
 	{
-		TiDev.messageArea.setMessage('Installing new '+msg+' Titanium Developer...');
-
-		// call this method to cause the app to restart and install
-		Titanium.UpdateManager.installAppUpdate(details, function()
+		$('#sdk_download_link').click(function()
 		{
-			TiDev.showDefaultSystemMessage();
+			TiDev.messageArea.setMessage('Installing new Titanium Developer...');
+
+			// call this method to cause the app to restart and install
+			Titanium.UpdateManager.installAppUpdate(details, function()
+			{
+				TiDev.showDefaultSystemMessage();
+			});
 		});
 	});
+	TiDev.messageArea.showDefaultMessage();
 };
 
 //
@@ -499,37 +501,41 @@ Titanium.UpdateManager.startMonitor(['sdk','mobilesdk'],function(details)
 TiDev.showSDKAvailableMessage = function(type,msg, details)
 {
 	TiDev.messageArea.setCollapsedWidth('390px');
-	TiDev.messageArea.setDefaultMessage('New ' + msg + ' SDK available (version ' + details.version + '). <span id="sdk_download_link" style="text-decoration:underline">Click to download</span>');
-	TiDev.messageArea.showDefaultMessage();
-
-	$('#sdk_download_link').click(function()
+	TiDev.messageArea.setDefaultMessage('New ' + msg + ' SDK available (version ' + details.version + '). <span id="sdk_download_link" style="text-decoration:underline">Click to download</span>',
+	function()
 	{
-		if (type == Titanium.API.SDK)
+		$('#sdk_download_link').click(function()
 		{
-			var children = details.children;
-			if (children)
+			if (type == Titanium.API.SDK)
 			{
-				var ar = [Titanium.API.createDependency(type,details.name,details.version)];
-				for (var i=0;i<children.length;i++)
+				var children = details.children;
+				if (children)
 				{
-					var t = Titanium.API.componentGUIDToComponentType(children[i].guid);
-					ar.push(Titanium.API.createDependency(t,children[i].name,children[i].version));
+					var ar = [Titanium.API.createDependency(type,details.name,details.version)];
+					for (var i=0;i<children.length;i++)
+					{
+						var t = Titanium.API.componentGUIDToComponentType(children[i].guid);
+						ar.push(Titanium.API.createDependency(t,children[i].name,children[i].version));
+					}
+					Titanium.UpdateManager.install(ar,function()
+					{
+						TiDev.showDefaultSystemMessage();
+					});
 				}
-				Titanium.UpdateManager.install(ar,function()
+			}
+			else
+			{	
+				Titanium.UpdateManager.install([Titanium.API.createDependency(type,details.name,details.version)], function()
 				{
 					TiDev.showDefaultSystemMessage();
 				});
 			}
-		}
-		else
-		{	
-			Titanium.UpdateManager.install([Titanium.API.createDependency(type,details.name,details.version)], function()
-			{
-				TiDev.showDefaultSystemMessage();
-			});
-		}
-		TiDev.messageArea.setMessage('Installing new '+msg+' SDK...');
-	})
+			TiDev.messageArea.setMessage('Installing new '+msg+' SDK...');
+		});
+
+	});
+	TiDev.messageArea.showDefaultMessage();
+
 };
 
 //
@@ -720,7 +726,7 @@ TiDev.invokeCloudService = function(name,data,type,sCallback,fCallback)
 	var data = (data)?data:{};
 
 	// set timeout low if the online event hasn't fired and we are logging (should only happen once)
-	var timeout = (name == 'sso-login' && TiDev.onlineListenerFired==false)?800:10000;
+	var timeout = (name == 'sso-login' && !Titanium.Network.online && TiDev.onlineListenerFired==false)?800:10000;
 
 	// xhr auth (for packaging services)
 	function xhrAuth(data)
@@ -742,6 +748,11 @@ TiDev.invokeCloudService = function(name,data,type,sCallback,fCallback)
 	// function to run service request once authenticated
 	function runIt()
 	{
+		data.sid = Projects.userSID;
+		data.token = Projects.userToken;
+		data.uid = Projects.userUID;
+		data.uidt = Projects.userUIDT;
+
 		$.ajax({
 			url:url,
 			type:type,
@@ -765,7 +776,7 @@ TiDev.invokeCloudService = function(name,data,type,sCallback,fCallback)
 					xhrAuth(data);
 				}
 			},
-			error:function(resp)
+			error:function(resp,ex)
 			{
 				// toggle cloud state
 				$('#tiui_cloud_on').css('display','none');
@@ -820,7 +831,7 @@ TiDev.invokeCloudService = function(name,data,type,sCallback,fCallback)
 			{
 				// we are logged in, so run request
 				if (resp.success == true)
-				{				
+				{		
 					// record tokens
 					Projects.userSID = resp.sid;
 					Projects.userToken = resp.token;
@@ -1031,9 +1042,9 @@ TiDev.launchPython = function(script, args)
 	var process = null;
 	if (Titanium.platform == "win32") {
 		var scriptArgs = [];
-		scriptArgs.push(script);
+		scriptArgs.push('"'+script+'"');
 		for (var i = 0; i < args.length; i++) {
-			scriptArgs.push(args[i]);
+			scriptArgs.push('"'+args[i]+'"');
 		}
 		process = Titanium.Process.launch("python.exe", scriptArgs);
 	}

diff --git a/Resources/js/project.js b/Resources/js/project.js
@@ -113,6 +113,9 @@ Titanium.Project =
 		// write out optional modules
 		for (var c=0;c<this.optionalModules.length;c++)
 		{
+			if (project.appid != 'com.appcelerator.titanium.developer' && this.optionalModules[c].name.indexOf('sdk')!=-1)
+				continue;
+
 			// check for optional ruby language module
 			if (this.optionalModules[c].name == 'ruby')
 			{

diff --git a/Resources/modules/links/js/links.js b/Resources/modules/links/js/links.js
@@ -51,7 +51,7 @@ Links.setPageData = function()
 		appPage = dbRows.fieldByName('page_url');
 		lastUpdatedDate = dbRows.fieldByName('date')
 		var platform = dbRows.fieldByName('platform');
-		var url = dbRows.fieldByName('page_url');
+		var url = dbRows.fieldByName('url');
 		var label = dbRows.fieldByName('label');
 
 		linksArray.push({url:url,label:label,platform:platform})