incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bcur...@apache.org
Subject [1/2] android commit: Updating cordova.android.js with File API fixes.
Date Wed, 29 Feb 2012 04:32:45 GMT
Updated Branches:
  refs/heads/master d59344818 -> 3ebc1d71d


Updating cordova.android.js with File API fixes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/3ebc1d71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/3ebc1d71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/3ebc1d71

Branch: refs/heads/master
Commit: 3ebc1d71df9fd42268c9b76a87dbc86ce1e38d52
Parents: f6503f8
Author: Bryce Curtis <curtis.bryce@gmail.com>
Authored: Tue Feb 28 22:32:30 2012 -0600
Committer: Bryce Curtis <curtis.bryce@gmail.com>
Committed: Tue Feb 28 22:32:30 2012 -0600

----------------------------------------------------------------------
 framework/assets/js/cordova.android.js |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/3ebc1d71/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index 2a805b6..89ffd34 100755
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -2264,7 +2264,10 @@ DirectoryEntry.prototype.getDirectory = function(path, options, successCallback,
  * @param {Function} errorCallback is called with a FileError
  */
 DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    exec(successCallback, errorCallback, "File", "removeRecursively", [this.fullPath]);
+    var fail = function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(successCallback, fail, "File", "removeRecursively", [this.fullPath]);
 };
 
 /**
@@ -2326,7 +2329,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         }
         successCallback(retVal);
     };
-    exec(win, errorCallback, "File", "readEntries", [this.path]);
+    var fail = function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "readEntries", [this.path]);
 };
 
 module.exports = DirectoryReader;
@@ -2373,8 +2379,10 @@ Entry.prototype.getMetadata = function(successCallback, errorCallback)
{
       var metadata = new Metadata(lastModified);
       successCallback(metadata);
   };
-
-  exec(success, errorCallback, "File", "getMetadata", [this.fullPath]);
+  var fail = function(code) {
+      errorCallback(new FileError(code));
+  };
+  exec(success, fail, "File", "getMetadata", [this.fullPath]);
 };
 
 /**
@@ -2520,7 +2528,10 @@ Entry.prototype.remove = function(successCallback, errorCallback) {
  * @param errorCallback {Function} called with a FileError
  */
 Entry.prototype.getParent = function(successCallback, errorCallback) {
-    exec(successCallback, errorCallback, "File", "getParent", [this.fullPath]);
+    var fail = function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(successCallback, fail, "File", "getParent", [this.fullPath]);
 };
 
 module.exports = Entry;
@@ -3740,7 +3751,6 @@ var NetworkConnection = function () {
                 if (info === "none") {
                     // set a timer if still offline at the end of timer send the offline
event
                     me._timer = setTimeout(function(){
-                        me.type = type;
                         cordova.fireWindowEvent("offline");
                         me._timer = null;
                         }, me.timeout);
@@ -3957,7 +3967,10 @@ var requestFileSystem = function(type, size, successCallback, errorCallback)
{
         errorCallback(new FileError(FileError.NOT_FOUND_ERR));
       }
     };
-    exec(success, errorCallback, "File", "requestFileSystem", [type, size]);
+    var fail = function(e) {
+        errorCallback(new FileError(e));
+    };   
+    exec(success, fail, "File", "requestFileSystem", [type, size]);
   }
 };
 


Mime
View raw message