diff --git a/.classpath b/.classpath index 0a9f339..a2d45b0 100644 --- a/.classpath +++ b/.classpath @@ -6,6 +6,6 @@ - + diff --git a/.phonegap/android/phonegap-1.3.0.jar b/.phonegap/android/phonegap-1.3.0.jar deleted file mode 100644 index 5c25305..0000000 Binary files a/.phonegap/android/phonegap-1.3.0.jar and /dev/null differ diff --git a/.phonegap/android/phonegap-1.4.1.jar b/.phonegap/android/phonegap-1.4.1.jar new file mode 100644 index 0000000..a30e021 Binary files /dev/null and b/.phonegap/android/phonegap-1.4.1.jar differ diff --git a/.phonegap/android/phonegap-1.3.0.js b/.phonegap/android/phonegap-1.4.1.js similarity index 98% rename from .phonegap/android/phonegap-1.3.0.js rename to .phonegap/android/phonegap-1.4.1.js index 077fa38..908b8a8 100644 --- a/.phonegap/android/phonegap-1.3.0.js +++ b/.phonegap/android/phonegap-1.4.1.js @@ -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(); @@ -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. */ @@ -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; @@ -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; @@ -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; diff --git a/.phonegap/config b/.phonegap/config index e3ee69d..98c84c9 100644 --- a/.phonegap/config +++ b/.phonegap/config @@ -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 diff --git a/assets/www/index.html b/assets/www/index.html index a3bf163..39b9bef 100644 --- a/assets/www/index.html +++ b/assets/www/index.html @@ -5,7 +5,7 @@ PhoneGap - + diff --git a/assets/www/phonegap-1.3.0.js b/assets/www/phonegap-1.4.1.js similarity index 98% rename from assets/www/phonegap-1.3.0.js rename to assets/www/phonegap-1.4.1.js index 077fa38..908b8a8 100644 --- a/assets/www/phonegap-1.3.0.js +++ b/assets/www/phonegap-1.4.1.js @@ -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(); @@ -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. */ @@ -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; @@ -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; @@ -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; diff --git a/examples/PhoneGapCouchApp/couchapp/_attachments/index.html b/examples/PhoneGapCouchApp/couchapp/_attachments/index.html index a3bf163..39b9bef 100644 --- a/examples/PhoneGapCouchApp/couchapp/_attachments/index.html +++ b/examples/PhoneGapCouchApp/couchapp/_attachments/index.html @@ -5,7 +5,7 @@ PhoneGap - + diff --git a/examples/PhotoShare/couchapp/_attachments/index.html b/examples/PhotoShare/couchapp/_attachments/index.html index fd4210d..b50ae7c 100644 --- a/examples/PhotoShare/couchapp/_attachments/index.html +++ b/examples/PhotoShare/couchapp/_attachments/index.html @@ -283,7 +283,7 @@ - diff --git a/libs/phonegap-1.3.0.jar b/libs/phonegap-1.3.0.jar deleted file mode 100644 index 5c25305..0000000 Binary files a/libs/phonegap-1.3.0.jar and /dev/null differ diff --git a/libs/phonegap-1.4.1.jar b/libs/phonegap-1.4.1.jar new file mode 100644 index 0000000..a30e021 Binary files /dev/null and b/libs/phonegap-1.4.1.jar differ diff --git a/phonegap/templates/project/assets/www/index.html b/phonegap/templates/project/assets/www/index.html index a3bf163..39b9bef 100644 --- a/phonegap/templates/project/assets/www/index.html +++ b/phonegap/templates/project/assets/www/index.html @@ -5,7 +5,7 @@ PhoneGap - +