Skip to content

Upgraded to latest version of phonegap (1.4.1) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded to latest version of phonegap (1.4.1) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="lib" path="libs/couchbase-2.0.0-dp-31.jar"/>
<classpathentry kind="lib" path="libs/OtpErlang-r14b03.jar"/>
<classpathentry kind="lib" path="libs/phonegap-1.3.0.jar"/>
<classpathentry kind="lib" path="libs/phonegap-1.4.1.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
Binary file removed .phonegap/android/phonegap-1.3.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added .phonegap/android/phonegap-1.4.1.jar
View file
Open in desktop
Binary file not shown.
52 changes: 1 addition & 51 deletions .phonegap/android/phonegap-1.3.0.js → .phonegap/android/phonegap-1.4.1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,39 +997,6 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
PhoneGap.exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
};

/*
* DEPRECATED
* This is only for Android.
*
* You must explicitly override the back button.
*/
Device.prototype.overrideBackButton = function() {
console.log("Device.overrideBackButton() is deprecated. Use App.overrideBackbutton(true).");
navigator.app.overrideBackbutton(true);
};

/*
* DEPRECATED
* This is only for Android.
*
* This resets the back button to the default behaviour
*/
Device.prototype.resetBackButton = function() {
console.log("Device.resetBackButton() is deprecated. Use App.overrideBackbutton(false).");
navigator.app.overrideBackbutton(false);
};

/*
* DEPRECATED
* This is only for Android.
*
* This terminates the activity!
*/
Device.prototype.exitApp = function() {
console.log("Device.exitApp() is deprecated. Use App.exitApp().");
navigator.app.exitApp();
};

PhoneGap.addConstructor(function() {
if (typeof navigator.device === "undefined") {
navigator.device = window.device = new Device();
Expand Down Expand Up @@ -1250,19 +1217,6 @@ App.prototype.backHistory = function() {
PhoneGap.exec(null, null, "App", "backHistory", []);
};

/**
* Override the default behavior of the Android back button.
* If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
*
* Note: The user should not have to call this method. Instead, when the user
* registers for the "backbutton" event, this is automatically done.
*
* @param override T=override, F=cancel override
*/
App.prototype.overrideBackbutton = function(override) {
PhoneGap.exec(null, null, "App", "overrideBackbutton", [override]);
};

/**
* Exit and terminate the application.
*/
Expand Down Expand Up @@ -1538,7 +1492,7 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
options.maxResolution = 0;
}
if (options.destinationType === null || typeof options.destinationType === "undefined") {
options.destinationType = Camera.DestinationType.DATA_URL;
options.destinationType = Camera.DestinationType.FILE_URI;
}
if (options.sourceType === null || typeof options.sourceType === "undefined") {
options.sourceType = Camera.PictureSourceType.CAMERA;
Expand Down Expand Up @@ -3234,11 +3188,9 @@ LocalFileSystem.prototype._castFS = function(pluginResult) {
LocalFileSystem.prototype._castEntry = function(pluginResult) {
var entry = null;
if (pluginResult.message.isDirectory) {
console.log("This is a dir");
entry = new DirectoryEntry();
}
else if (pluginResult.message.isFile) {
console.log("This is a file");
entry = new FileEntry();
}
entry.isDirectory = pluginResult.message.isDirectory;
Expand All @@ -3262,11 +3214,9 @@ LocalFileSystem.prototype._castEntries = function(pluginResult) {
LocalFileSystem.prototype._createEntry = function(castMe) {
var entry = null;
if (castMe.isDirectory) {
console.log("This is a dir");
entry = new DirectoryEntry();
}
else if (castMe.isFile) {
console.log("This is a file");
entry = new FileEntry();
}
entry.isDirectory = castMe.isDirectory;
Expand Down
2 changes: 1 addition & 1 deletion .phonegap/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=1.3.0
VERSION=1.4.1
PROJECT_PATH=/Users/mschoch/Documents/workspace/Android-Couchbase-Callback/
PACKAGE=com.couchbase.callback
ACTIVITY=PhoneGapExample
Expand Down
2 changes: 1 addition & 1 deletion assets/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0.js"></script>
<script type="text/javascript" charset="utf-8" src="phonegap-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>

</head>
Expand Down
52 changes: 1 addition & 51 deletions assets/www/phonegap-1.3.0.js → assets/www/phonegap-1.4.1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,39 +997,6 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
PhoneGap.exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
};

/*
* DEPRECATED
* This is only for Android.
*
* You must explicitly override the back button.
*/
Device.prototype.overrideBackButton = function() {
console.log("Device.overrideBackButton() is deprecated. Use App.overrideBackbutton(true).");
navigator.app.overrideBackbutton(true);
};

/*
* DEPRECATED
* This is only for Android.
*
* This resets the back button to the default behaviour
*/
Device.prototype.resetBackButton = function() {
console.log("Device.resetBackButton() is deprecated. Use App.overrideBackbutton(false).");
navigator.app.overrideBackbutton(false);
};

/*
* DEPRECATED
* This is only for Android.
*
* This terminates the activity!
*/
Device.prototype.exitApp = function() {
console.log("Device.exitApp() is deprecated. Use App.exitApp().");
navigator.app.exitApp();
};

PhoneGap.addConstructor(function() {
if (typeof navigator.device === "undefined") {
navigator.device = window.device = new Device();
Expand Down Expand Up @@ -1250,19 +1217,6 @@ App.prototype.backHistory = function() {
PhoneGap.exec(null, null, "App", "backHistory", []);
};

/**
* Override the default behavior of the Android back button.
* If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
*
* Note: The user should not have to call this method. Instead, when the user
* registers for the "backbutton" event, this is automatically done.
*
* @param override T=override, F=cancel override
*/
App.prototype.overrideBackbutton = function(override) {
PhoneGap.exec(null, null, "App", "overrideBackbutton", [override]);
};

/**
* Exit and terminate the application.
*/
Expand Down Expand Up @@ -1538,7 +1492,7 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
options.maxResolution = 0;
}
if (options.destinationType === null || typeof options.destinationType === "undefined") {
options.destinationType = Camera.DestinationType.DATA_URL;
options.destinationType = Camera.DestinationType.FILE_URI;
}
if (options.sourceType === null || typeof options.sourceType === "undefined") {
options.sourceType = Camera.PictureSourceType.CAMERA;
Expand Down Expand Up @@ -3234,11 +3188,9 @@ LocalFileSystem.prototype._castFS = function(pluginResult) {
LocalFileSystem.prototype._castEntry = function(pluginResult) {
var entry = null;
if (pluginResult.message.isDirectory) {
console.log("This is a dir");
entry = new DirectoryEntry();
}
else if (pluginResult.message.isFile) {
console.log("This is a file");
entry = new FileEntry();
}
entry.isDirectory = pluginResult.message.isDirectory;
Expand All @@ -3262,11 +3214,9 @@ LocalFileSystem.prototype._castEntries = function(pluginResult) {
LocalFileSystem.prototype._createEntry = function(castMe) {
var entry = null;
if (castMe.isDirectory) {
console.log("This is a dir");
entry = new DirectoryEntry();
}
else if (castMe.isFile) {
console.log("This is a file");
entry = new FileEntry();
}
entry.isDirectory = castMe.isDirectory;
Expand Down
2 changes: 1 addition & 1 deletion examples/PhoneGapCouchApp/couchapp/_attachments/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0.js"></script>
<script type="text/javascript" charset="utf-8" src="phonegap-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>

</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/PhotoShare/couchapp/_attachments/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
</script>
<script src="javascript/jquery-1.6.4.min.js">
</script>
<script src="javascript/phonegap-1.3.0.js">
<script src="javascript/phonegap-1.4.1.js">
</script>
<script src="javascript/coux.js">
</script>
Expand Down
Binary file removed libs/phonegap-1.3.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added libs/phonegap-1.4.1.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion phonegap/templates/project/assets/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0.js"></script>
<script type="text/javascript" charset="utf-8" src="phonegap-1.4.1.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>

</head>
Expand Down