mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-22 00:32:55 +08:00
Merge branch 'master' of github.com:phonegap/phonegap-android
This commit is contained in:
commit
19332c1903
@ -5,7 +5,7 @@
|
||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
|
||||
<title>PhoneGap</title>
|
||||
<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>
|
||||
|
||||
</head>
|
||||
|
@ -172,7 +172,7 @@ FileReader.prototype.abort = function() {
|
||||
}
|
||||
// If abort callback
|
||||
if (typeof this.onabort === "function") {
|
||||
this.oneabort({"type":"abort", "target":this});
|
||||
this.onabort({"type":"abort", "target":this});
|
||||
}
|
||||
// If load end callback
|
||||
if (typeof this.onloadend === "function") {
|
||||
@ -431,7 +431,7 @@ FileWriter.prototype.abort = function() {
|
||||
}
|
||||
// If abort callback
|
||||
if (typeof this.onabort === "function") {
|
||||
this.oneabort({"type":"abort", "target":this});
|
||||
this.onabort({"type":"abort", "target":this});
|
||||
}
|
||||
|
||||
this.readyState = FileWriter.DONE;
|
||||
|
@ -1,7 +1,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<title></title>
|
||||
<script src="phonegap-1.0.0rc3.js"></script>
|
||||
<script src="phonegap-1.0.0.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
@ -18,7 +18,7 @@ import android.provider.Settings;
|
||||
|
||||
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 uuid; // Device UUID
|
||||
|
||||
|
@ -149,7 +149,6 @@ class Classic
|
||||
j = "
|
||||
package #{ @pkg };
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
import com.phonegap.*;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user