You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/06/11 21:44:11 UTC
[1/2] git commit: Fix mis-handling of filesystem reference in
Entry.moveTo ('this' used in closure).
Repository: cordova-plugin-file
Updated Branches:
refs/heads/master 17297e56d -> 239654900
Fix mis-handling of filesystem reference in Entry.moveTo ('this' used in closure).
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/c06d35b9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/c06d35b9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/c06d35b9
Branch: refs/heads/master
Commit: c06d35b9bab4843363b31c264d41b3384b29423c
Parents: a9b6b40
Author: Jake Cobb <jc...@us.fujitsu.com>
Authored: Tue Jun 3 11:45:08 2014 -0700
Committer: Jake Cobb <jc...@us.fujitsu.com>
Committed: Tue Jun 3 11:45:08 2014 -0700
----------------------------------------------------------------------
www/Entry.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/c06d35b9/www/Entry.js
----------------------------------------------------------------------
diff --git a/www/Entry.js b/www/Entry.js
index d143d32..5e781f5 100644
--- a/www/Entry.js
+++ b/www/Entry.js
@@ -145,7 +145,8 @@ Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallbac
var fail = errorCallback && function(code) {
errorCallback(new FileError(code));
};
- var srcURL = this.toInternalURL(),
+ var filesystem = this.filesystem,
+ srcURL = this.toInternalURL(),
// entry name
name = newName || this.name,
// success callback
@@ -153,7 +154,7 @@ Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallbac
if (entry) {
if (successCallback) {
// create appropriate Entry object
- var fs = entry.filesystemName ? new FileSystem(entry.filesystemName, {name:"", fullPath:"/"}) : this.filesystem;
+ var fs = entry.filesystemName ? new FileSystem(entry.filesystemName, {name:"", fullPath:"/"}) : filesystem;
var result = (entry.isDirectory) ? new (require('./DirectoryEntry'))(entry.name, entry.fullPath, fs, entry.nativeURL) : new (require('org.apache.cordova.file.FileEntry'))(entry.name, entry.fullPath, fs, entry.nativeURL);
successCallback(result);
}
[2/2] git commit: Merge branch 'jakecobb/master' (This closes #48)
Posted by ia...@apache.org.
Merge branch 'jakecobb/master' (This closes #48)
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/23965490
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/23965490
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/23965490
Branch: refs/heads/master
Commit: 239654900cce78edd044e63536dcbfd4702a18b5
Parents: 17297e5 c06d35b
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Jun 11 15:36:52 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed Jun 11 15:36:52 2014 -0400
----------------------------------------------------------------------
www/Entry.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/23965490/www/Entry.js
----------------------------------------------------------------------