github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 20:33:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android into file_slicing

Browse Source
This commit is contained in:
Braden Shepherdson 2013-01-07 18:13:54 -05:00
commit 5f6824e5dd
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.3.0rc2 2.3.0

2
bin/templates/project/assets/www/index.html
View File

@ -33,7 +33,7 @@
<p class="event received">Device is Ready</p> <p class="event received">Device is Ready</p>
</div> </div>
</div> </div>
<script type="text/javascript" src="cordova-2.3.0rc2.js"></script> <script type="text/javascript" src="cordova-2.3.0.js"></script>
<script type="text/javascript" src="js/index.js"></script> <script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript"> <script type="text/javascript">
app.initialize(); app.initialize();

8
framework/assets/js/cordova.android.js
View File

@ -1,6 +1,6 @@
// commit 4301bc92e237b59d5515bd7758ab289e454168cb // commit 4082ee0ba3a8902cba7bd087d0584bb7534e694b
// File generated at :: Mon Dec 10 2012 14:13:09 GMT-0800 (PST) // File generated at :: Wed Jan 02 2013 16:43:38 GMT-0800 (PST)
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
@ -6420,12 +6420,12 @@ window.cordova = require('cordova');
// Drop the common globals into the window object, but be nice and don't overwrite anything. // Drop the common globals into the window object, but be nice and don't overwrite anything.
builder.buildIntoButDoNotClobber(base.defaults, context); builder.buildIntoButDoNotClobber(base.defaults, context);
builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoAndClobber(base.clobbers, context); builder.buildIntoAndClobber(base.clobbers, context);
builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoButDoNotClobber(platform.defaults, context); builder.buildIntoButDoNotClobber(platform.defaults, context);
builder.buildIntoAndMerge(platform.merges, context);
builder.buildIntoAndClobber(platform.clobbers, context); builder.buildIntoAndClobber(platform.clobbers, context);
builder.buildIntoAndMerge(platform.merges, context);
// Call the platform-specific initialization // Call the platform-specific initialization
platform.initialize(); platform.initialize();

2
framework/assets/www/index.html
View File

@ -19,7 +19,7 @@
<html> <html>
<head> <head>
<title></title> <title></title>
<script src="cordova-2.3.0rc2.js"></script> <script src="cordova-2.3.0.js"></script>
</head> </head>
<body> <body>

2
framework/src/org/apache/cordova/Device.java
View File

@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
public class Device extends CordovaPlugin { public class Device extends CordovaPlugin {
public static final String TAG = "Device"; public static final String TAG = "Device";
public static String cordovaVersion = "2.3.0rc2"; // Cordova version public static String cordovaVersion = "2.3.0"; // Cordova version
public static String platform = "Android"; // Device OS public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID public static String uuid; // Device UUID

3
framework/src/org/apache/cordova/InAppBrowser.java
View File

@ -414,6 +414,9 @@ public class InAppBrowser extends CordovaPlugin {
*/ */
// @TODO: replace with settings.setPluginState(android.webkit.WebSettings.PluginState.ON) // @TODO: replace with settings.setPluginState(android.webkit.WebSettings.PluginState.ON)
settings.setPluginsEnabled(true); settings.setPluginsEnabled(true);
settings.setDatabaseEnabled(true);
String databasePath = cordova.getActivity().getApplicationContext().getDir("inAppBrowserDB", Context.MODE_PRIVATE).getPath();
settings.setDatabasePath(databasePath);
settings.setDomStorageEnabled(true); settings.setDomStorageEnabled(true);
inAppWebView.loadUrl(url); inAppWebView.loadUrl(url);
inAppWebView.setId(6); inAppWebView.setId(6);