Merge branch 'master' of github.com:phonegap/phonegap-android

This commit is contained in:
Anis Kadri 2011-08-09 16:25:19 -07:00
commit 19332c1903
6 changed files with 6 additions and 7 deletions

View File

@ -1 +1 @@
1.0.0rc3 1.0.0

View File

@ -5,7 +5,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>PhoneGap</title> <title>PhoneGap</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"> <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script type="text/javascript" charset="utf-8" src="phonegap-1.0.0rc3.js"></script> <script type="text/javascript" charset="utf-8" src="phonegap-1.0.0.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script> <script type="text/javascript" charset="utf-8" src="main.js"></script>
</head> </head>

View File

@ -172,7 +172,7 @@ FileReader.prototype.abort = function() {
} }
// If abort callback // If abort callback
if (typeof this.onabort === "function") { if (typeof this.onabort === "function") {
this.oneabort({"type":"abort", "target":this}); this.onabort({"type":"abort", "target":this});
} }
// If load end callback // If load end callback
if (typeof this.onloadend === "function") { if (typeof this.onloadend === "function") {
@ -431,7 +431,7 @@ FileWriter.prototype.abort = function() {
} }
// If abort callback // If abort callback
if (typeof this.onabort === "function") { if (typeof this.onabort === "function") {
this.oneabort({"type":"abort", "target":this}); this.onabort({"type":"abort", "target":this});
} }
this.readyState = FileWriter.DONE; this.readyState = FileWriter.DONE;

View File

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<title></title> <title></title>
<script src="phonegap-1.0.0rc3.js"></script> <script src="phonegap-1.0.0.js"></script>
</head> </head>
<body> <body>

View File

@ -18,7 +18,7 @@ import android.provider.Settings;
public class Device extends Plugin { public class Device extends Plugin {
public static String phonegapVersion = "1.0.0rc3"; // PhoneGap version public static String phonegapVersion = "1.0.0"; // PhoneGap 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

View File

@ -149,7 +149,6 @@ class Classic
j = " j = "
package #{ @pkg }; package #{ @pkg };
import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import com.phonegap.*; import com.phonegap.*;