Merge branch 'master' of git://github.com/filmaj/phonegap

phonegap · Jul 29, 2009 · c917751 · c917751
2 parents d48fd9c + 4b401ab
commit c917751
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/blackberry/phonegap.jdp b/blackberry/phonegap.jdp
@@ -21,6 +21,14 @@ AutoRestart=0
 ]
 ExcludeFromBuildAll=0
 [Files
+..\..\..\..\workspace_blackberry\phonegap\src\0.png
+..\..\..\..\workspace_blackberry\phonegap\src\1.png
+..\..\..\..\workspace_blackberry\phonegap\src\2.png
+..\..\..\..\workspace_blackberry\phonegap\src\3.png
+..\..\..\..\workspace_blackberry\phonegap\src\4.png
+..\..\..\..\workspace_blackberry\phonegap\src\5.png
+..\..\..\..\workspace_blackberry\phonegap\src\camera.html
+..\..\..\..\workspace_blackberry\phonegap\src\camera.js
 ..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\Command.java
 ..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\CommandManager.java
 ..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\api\impl\CameraCommand.java
@@ -35,6 +43,18 @@ ExcludeFromBuildAll=0
 ..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\io\QueueResourceFetcher.java
 ..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\model\Position.java
 ..\..\..\..\workspace_blackberry\phonegap\src\com\nitobi\phonegap\PhoneGap.java
+..\..\..\..\workspace_blackberry\phonegap\src\contacts.html
+..\..\..\..\workspace_blackberry\phonegap\src\contacts.js
+..\..\..\..\workspace_blackberry\phonegap\src\device.html
+..\..\..\..\workspace_blackberry\phonegap\src\device.js
+..\..\..\..\workspace_blackberry\phonegap\src\geolocation.js
+..\..\..\..\workspace_blackberry\phonegap\src\index.html
+..\..\..\..\workspace_blackberry\phonegap\src\io.html
+..\..\..\..\workspace_blackberry\phonegap\src\location.html
+..\..\..\..\workspace_blackberry\phonegap\src\position.js
+..\..\..\..\workspace_blackberry\phonegap\src\telephony.html
+..\..\..\..\workspace_blackberry\phonegap\src\telephony.js
+..\..\..\..\workspace_blackberry\phonegap\src\vibration.html
 ..\..\..\..\workspace_blackberry\phonegap\src\www\js\camera.js
 ..\..\..\..\workspace_blackberry\phonegap\src\www\js\contacts.js
 ..\..\..\..\workspace_blackberry\phonegap\src\www\js\device.js

diff --git a/blackberry/src/com/nitobi/phonegap/PhoneGap.java b/blackberry/src/com/nitobi/phonegap/PhoneGap.java
@@ -54,7 +54,7 @@
 public class PhoneGap extends UiApplication implements RenderingApplication {
 
 	public static final String PHONEGAP_PROTOCOL = "gap://";
-	private static final String DEFAULT_INITIAL_URL = "file:///www/test/vibration.html";
+	private static final String DEFAULT_INITIAL_URL = "data:///www/test/index.html";
 
 	private Screen mainScreen;
 	private Vector pendingResponses = new Vector();
@@ -91,7 +91,8 @@ private void init(final String url) {
 		RenderingOptions renderingOptions = _browserContentManager.getRenderingSession().getRenderingOptions();
 		renderingOptions.setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.JAVASCRIPT_ENABLED, true);
 		renderingOptions.setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.JAVASCRIPT_LOCATION_ENABLED, true);
-		renderingOptions.setProperty(RenderingOptions.CORE_OPTIONS_GUID, 17000, true);
+		// The following line is commented out for now, until we figure out how to use this rendering mode properly.
+		//renderingOptions.setProperty(RenderingOptions.CORE_OPTIONS_GUID, 17000, true);
 		mainScreen = new MainScreen();
 		mainScreen.add(_browserContentManager);
         pushScreen(mainScreen);

diff --git a/blackberry/src/com/nitobi/phonegap/io/ConnectionManager.java b/blackberry/src/com/nitobi/phonegap/io/ConnectionManager.java
@@ -44,7 +44,7 @@
  */
 public final class ConnectionManager {
 
-	public static final String DATA = "file";
+	public static final String DATA = "data";
 	public static final String DATA_PROTOCOL = DATA + ":///";
 	private static final byte[] DATA_URL = (ConnectionManager.DATA + ":text/html;base64,").getBytes();