Merge pull request #1785 from bryan-m-hughes/timob-8165

Timob 8165 Geo fix.
tidev · Mar 21, 2012 · 4aa1137 · 4aa1137
2 parents 179266c + 804b523
commit 4aa1137
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/apidoc/Titanium/Platform/Platform.yml b/apidoc/Titanium/Platform/Platform.yml
@@ -26,7 +26,10 @@ events:
 methods:
   - name: canOpenURL
     summary: |
-      Returns whether the system is configured with a default application to handle the URL's protocol.
+        Returns whether the system is configured with a default application to handle the URL's protocol.
+    description: |
+        On Mobile Web, this method always returns true, even if the browser can't open the specific URL, 
+        unless the URL is empty or undefined.
     returns:
         type: Boolean
     platforms: [iphone, ipad]

diff --git a/mobileweb/titanium/Ti/Geolocation.js b/mobileweb/titanium/Ti/Geolocation.js
@@ -99,7 +99,7 @@ define(["Ti/_/Evented", "Ti/_/lang", "Ti/Network"], function(Evented, lang, Netw
 				},
 				timeout : api.MobileWeb.forwardGeocoderTimeout
 			});
-			client.open("GET", "http://api.appcelerator.com/p/v1/geo?d=f&" + 
+			client.open("GET", "http://api.appcelerator.net/p/v1/geo?d=f&" + 
 				// TODO "c=" + Locale.getCurrentCountry() + 
 				"q=" + escape(address));
 			client.send();
@@ -120,7 +120,7 @@ define(["Ti/_/Evented", "Ti/_/lang", "Ti/Network"], function(Evented, lang, Netw
 				},
 				timeout : api.MobileWeb.forwardGeocoderTimeout
 			});
-			client.open("GET", "http://api.appcelerator.com/p/v1/geo?d=r&" + 
+			client.open("GET", "http://api.appcelerator.net/p/v1/geo?d=r&" + 
 				// TODO "c=" + Locale.getCurrentCountry() + 
 				"q=" + latitude + "," + longitude);
 			client.send();

diff --git a/mobileweb/titanium/Ti/Platform.js b/mobileweb/titanium/Ti/Platform.js
@@ -29,15 +29,15 @@ define(["Ti/_", "Ti/_/browser", "Ti/_/Evented", "Ti/_/lang", "Ti/Locale", "Ti/_/
 		battery = nav.battery || nav.webkitBattery || nav.mozBattery,
 		Platform = lang.setObject("Ti.Platform", Evented, {
 
+			canOpenURL: function(url) {
+				return !!url;
+			},
+
 			createUUID: _.uuid,
 
 			is24HourTimeFormat: function() {
 				return false;
 			},
-
-			canOpenUrl: function() {
-				return true;
-			},
 
 			openURL: function(url){
 				if (/^([tel|sms|mailto])/.test(url)) {