You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2016/12/08 00:56:49 UTC
[1/7] cordova-plugin-file git commit: CB-11832 Incremented plugin
version.
Repository: cordova-plugin-file
Updated Branches:
refs/heads/4.3.x 5c0f68d1c -> db39e7cca
CB-11832 Incremented plugin version.
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/815c2b1b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/815c2b1b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/815c2b1b
Branch: refs/heads/4.3.x
Commit: 815c2b1bfe578ee9a9b0f998a906087aca379cd1
Parents: 5c0f68d
Author: Steve Gill <st...@gmail.com>
Authored: Fri Sep 9 16:08:04 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Sep 9 16:08:04 2016 -0700
----------------------------------------------------------------------
package.json | 2 +-
plugin.xml | 2 +-
tests/plugin.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/815c2b1b/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index eb9a096..715d261 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-file",
- "version": "4.3.0",
+ "version": "4.3.1-dev",
"description": "Cordova File Plugin",
"cordova": {
"id": "cordova-plugin-file",
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/815c2b1b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 247a8cb..c55e3ab 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,7 +21,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-file"
- version="4.3.0">
+ version="4.3.1-dev">
<name>File</name>
<description>Cordova File Plugin</description>
<license>Apache 2.0</license>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/815c2b1b/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 8075a4d..c3b0cba 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -22,7 +22,7 @@
xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-file-tests"
- version="4.3.0">
+ version="4.3.1-dev">
<name>Cordova File Plugin Tests</name>
<license>Apache 2.0</license>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/7] cordova-plugin-file git commit: CB-11848 windows: Remove
duplicate slash after file system path
Posted by sh...@apache.org.
CB-11848 windows: Remove duplicate slash after file system path
This closes #195, this closes #112
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/7ae74f53
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/7ae74f53
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/7ae74f53
Branch: refs/heads/4.3.x
Commit: 7ae74f5385e14b1e81ed7396ba12c21782d6eac7
Parents: 7dbef06
Author: Nikita Matrosov <ma...@gmail.com>
Authored: Thu Sep 29 15:36:29 2016 +0300
Committer: Vladimir Kotikov <ko...@gmail.com>
Committed: Thu Oct 6 17:20:25 2016 +0300
----------------------------------------------------------------------
src/windows/FileProxy.js | 9 +++++++--
tests/tests.js | 14 ++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/7ae74f53/src/windows/FileProxy.js
----------------------------------------------------------------------
diff --git a/src/windows/FileProxy.js b/src/windows/FileProxy.js
index 79a7f41..c342a56 100644
--- a/src/windows/FileProxy.js
+++ b/src/windows/FileProxy.js
@@ -154,8 +154,13 @@ var WinFS = function(name, root) {
if (this.winpath && !/\/$/.test(this.winpath)) {
this.winpath += "/";
}
- this.makeNativeURL = function(path) {
- return FileSystem.encodeURIPath(this.root.nativeURL + sanitize(path.replace(':','%3A')));};
+ this.makeNativeURL = function (path) {
+ //CB-11848: This RE supposed to match all leading slashes in sanitized path.
+ //Removing leading slash to avoid duplicating because this.root.nativeURL already has trailing slash
+ var regLeadingSlashes = /^\/*/;
+ var sanitizedPath = sanitize(path.replace(':', '%3A')).replace(regLeadingSlashes, '');
+ return FileSystem.encodeURIPath(this.root.nativeURL + sanitizedPath);
+ };
root.fullPath = '/';
if (!root.nativeURL)
root.nativeURL = 'file://'+sanitize(this.winpath + root.fullPath).replace(':','%3A');
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/7ae74f53/tests/tests.js
----------------------------------------------------------------------
diff --git a/tests/tests.js b/tests/tests.js
index c57d18b..eb74c14 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -368,6 +368,20 @@ exports.defineAutoTests = function () {
}
createDirectory(fileName, gotDirectory, failed.bind(null, done, 'createDirectory - Error creating directory: ' + fileName), failed.bind(null, done, 'createDirectory - Error creating directory: ' + fileName));
});
+
+ it("file.spec.9.7 should resolve a file with valid nativeURL", function (done) {
+ var fileName = "de.create.file",
+ win = function (entry) {
+ var path = entry.nativeURL.split('///')[1];
+ expect(/\/{2,}/.test(path)).toBeFalsy();
+ // cleanup
+ deleteEntry(entry.name, done);
+ };
+ root.getFile(fileName, {
+ create: true
+ }, win, succeed.bind(null, done, 'root.getFile - Error unexpected callback, file should not exists: ' + fileName));
+ });
+
it("file.spec.10 resolve valid file name with parameters", function (done) {
var fileName = "resolve.file.uri.params",
win = function (fileEntry) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/7] cordova-plugin-file git commit: CB-11947 fixed typo that occurs
when adding file-transfer plugin
Posted by sh...@apache.org.
CB-11947 fixed typo that occurs when adding file-transfer plugin
This closes #197
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/6376f767
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/6376f767
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/6376f767
Branch: refs/heads/4.3.x
Commit: 6376f76762cfece37a2d9a82d6bfae1017ff9acb
Parents: 815c2b1
Author: audreyso <au...@adobe.com>
Authored: Tue Oct 4 11:13:10 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Oct 4 16:16:06 2016 -0700
----------------------------------------------------------------------
plugin.xml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/6376f767/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index c55e3ab..aba8fee 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -109,8 +109,10 @@ xmlns:android="http://schemas.android.com/apk/res/android"
<runs />
</js-module>
- <info>
-The Android Persistent storage location now defaults to "Internal". Please check this plugins README to see if you application needs any changes in its config.xml.
+ <!-- android -->
+ <platform name="android">
+ <info>
+The Android Persistent storage location now defaults to "Internal". Please check this plugin's README to see if your application needs any changes in its config.xml.
If this is a new application no changes are required.
@@ -119,11 +121,7 @@ If this is an update to an existing application that did not specify an "Android
"<preference name="AndroidPersistentFileLocation" value="Compatibility" />"
to config.xml in order for the application to find previously stored files.
-
- </info>
-
- <!-- android -->
- <platform name="android">
+ </info>
<config-file target="res/xml/config.xml" parent="/*">
<feature name="File" >
<param name="android-package" value="org.apache.cordova.file.FileUtils"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[6/7] cordova-plugin-file git commit: CB-12112 windows: Make
available to move folder trees
Posted by sh...@apache.org.
CB-12112 windows: Make available to move folder trees
There was a mistake in the logic of recursive function for moving operation. As for destination folder, it was always used start folder.
This closes #198
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/a1cfabdc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/a1cfabdc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/a1cfabdc
Branch: refs/heads/4.3.x
Commit: a1cfabdce07cabd44694097fac6730b7317d4607
Parents: f4c2c94
Author: Nikita Matrosov <ma...@gmail.com>
Authored: Fri Nov 18 11:50:20 2016 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Thu Nov 24 17:53:16 2016 +0300
----------------------------------------------------------------------
src/windows/FileProxy.js | 4 ++--
tests/tests.js | 31 +++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/a1cfabdc/src/windows/FileProxy.js
----------------------------------------------------------------------
diff --git a/src/windows/FileProxy.js b/src/windows/FileProxy.js
index 64ee1df..fa56a53 100644
--- a/src/windows/FileProxy.js
+++ b/src/windows/FileProxy.js
@@ -404,8 +404,8 @@ function moveFolder(src,dst,name) {
src.deleteAsync().done(complete,failed);
return;
}
- moveFolder(the.folders[todo],dst)
- .done(movefolders,failed);
+ moveFolder(the.folders[todo], the.fld)
+ .done(movefolders,failed);
};
var movefiles = function() {
if (!(todo--)) {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/a1cfabdc/tests/tests.js
----------------------------------------------------------------------
diff --git a/tests/tests.js b/tests/tests.js
index eb74c14..acdcfa0 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -1758,6 +1758,37 @@ exports.defineAutoTests = function () {
}, failed.bind(null, done, 'createDirectory - Error creating directory : ' + srcDir));
}, failed.bind(null, done, 'deleteEntry - Error removing directory : ' + dstDir));
});
+
+ it("file.spec.131 moveTo: directories tree to new parent", function (done) {
+ if (isIndexedDBShim) {
+ /* `copyTo` and `moveTo` functions do not support directories (Firefox, IE) */
+ pending();
+ }
+
+ var srcDir = "entry.move.dnp.srcDir";
+ var srcDirNestedFirst = "entry.move.dnp.srcDir.Nested1";
+ var srcDirNestedSecond = "entry.move.dnp.srcDir.Nested2";
+ var dstDir = "entry.move.dnp.dstDir";
+
+ createDirectory(dstDir, function (dstDirectory) {
+ createDirectory(srcDir, function (srcDirectory) {
+ srcDirectory.getDirectory(srcDirNestedFirst, { create: true }, function () {
+ srcDirectory.getDirectory(srcDirNestedSecond, { create: true }, function () {
+ srcDirectory.moveTo(dstDirectory, srcDir, function successMove(transferredDirectory) {
+ var directoryReader = transferredDirectory.createReader();
+ directoryReader.readEntries(function successRead(entries) {
+ expect(entries.length).toBe(2);
+ expect(entries[0].name).toBe(srcDirNestedFirst);
+ expect(entries[1].name).toBe(srcDirNestedSecond);
+ deleteEntry(dstDir, done);
+ }, failed.bind(null, done, 'Error getting entries from: ' + transferredDirectory));
+ }, failed.bind(null, done, 'directory.moveTo - Error moving directory : ' + srcDir + ' to root as: ' + dstDir));
+ }, failed.bind(null, done, 'directory.getDirectory - Error creating directory : ' + srcDirNestedSecond));
+ }, failed.bind(null, done, 'directory.getDirectory - Error creating directory : ' + srcDirNestedFirst));
+ }, failed.bind(null, done, 'createDirectory - Error creating source directory : ' + srcDir));
+ }, failed.bind(null, done, 'createDirectory - Error creating dest directory : ' + dstDir));
+ });
+
it("file.spec.70 moveTo: directory onto itself", function (done) {
if (isIndexedDBShim) {
/* `copyTo` and `moveTo` functions do not support directories (Firefox, IE) */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/7] cordova-plugin-file git commit: fix ENCODING_ERR for
applicationDirectory
Posted by sh...@apache.org.
fix ENCODING_ERR for applicationDirectory
This closes #193
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/f4c2c94c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/f4c2c94c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/f4c2c94c
Branch: refs/heads/4.3.x
Commit: f4c2c94c2da58e87aa3e2a47aad9e1076945555e
Parents: 7ae74f5
Author: Reon90 <re...@gmail.com>
Authored: Thu Aug 25 23:25:49 2016 +0300
Committer: Vladimir Kotikov <ko...@gmail.com>
Committed: Mon Nov 7 13:13:57 2016 +0300
----------------------------------------------------------------------
src/windows/FileProxy.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/f4c2c94c/src/windows/FileProxy.js
----------------------------------------------------------------------
diff --git a/src/windows/FileProxy.js b/src/windows/FileProxy.js
index c342a56..64ee1df 100644
--- a/src/windows/FileProxy.js
+++ b/src/windows/FileProxy.js
@@ -200,6 +200,12 @@ function getAllFS() {
nativeURL: 'ms-appdata:///temp',
winpath: nativePathToCordova(Windows.Storage.ApplicationData.current.temporaryFolder.path)
})),
+ 'application':
+ Object.freeze(new WinFS('application', {
+ name: 'application',
+ nativeURL: 'ms-appx:///',
+ winpath: nativePathToCordova(Windows.ApplicationModel.Package.current.installedLocation.path)
+ })),
'root':
Object.freeze(new WinFS('root', {
name: 'root',
@@ -249,7 +255,7 @@ function pathFromURL(url) {
}
}
- ['file://','ms-appdata:///','cdvfile://localhost/'].every(function(p) {
+ ['file://','ms-appdata:///','ms-appx://','cdvfile://localhost/'].every(function(p) {
if (path.indexOf(p)!==0)
return true;
var thirdSlash = path.indexOf("/", p.length);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/7] cordova-plugin-file git commit: CB-11917 - Remove pull request template checklist item: "iCLA has been submitted…"
Posted by sh...@apache.org.
CB-11917 - Remove pull request template checklist item: "iCLA has been submitted\u2026"
This closes #196
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/7dbef06f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/7dbef06f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/7dbef06f
Branch: refs/heads/4.3.x
Commit: 7dbef06f695c2f08e7f50dbe8d09359bb6ec52d7
Parents: 6376f76
Author: Shazron Abdullah <sh...@gmail.com>
Authored: Wed Sep 28 01:28:30 2016 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Oct 4 21:39:03 2016 -0700
----------------------------------------------------------------------
.github/PULL_REQUEST_TEMPLATE.md | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/7dbef06f/.github/PULL_REQUEST_TEMPLATE.md
----------------------------------------------------------------------
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4bd6da9..91582f4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,7 +17,6 @@ Thanks!
### Checklist
-- [ ] [ICLA](http://www.apache.org/licenses/icla.txt) has been signed and submitted to secretary@apache.org.
- [ ] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database
- [ ] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
- [ ] Added automated test coverage as appropriate for this change.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[7/7] cordova-plugin-file git commit: CB-12224 Updated version and
RELEASENOTES.md for release 4.3.1
Posted by sh...@apache.org.
CB-12224 Updated version and RELEASENOTES.md for release 4.3.1
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/db39e7cc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/db39e7cc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/db39e7cc
Branch: refs/heads/4.3.x
Commit: db39e7ccab1df556f9bff6ce4e748eac703c41da
Parents: a1cfabd
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Dec 7 16:39:45 2016 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Dec 7 16:39:45 2016 -0800
----------------------------------------------------------------------
RELEASENOTES.md | 8 ++++++++
package.json | 2 +-
plugin.xml | 2 +-
tests/plugin.xml | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/db39e7cc/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d45118c..fd57274 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,14 @@
-->
# Release Notes
+### 4.3.1 (Dec 07, 2016)
+* [CB-12112](https://issues.apache.org/jira/browse/CB-12112) windows: Make available to move folder trees
+* fix ENCODING_ERR for applicationDirectory
+* [CB-11848](https://issues.apache.org/jira/browse/CB-11848) windows: Remove duplicate slash after file system path
+* [CB-11917](https://issues.apache.org/jira/browse/CB-11917) - Remove pull request template checklist item: "iCLA has been submitted\u2026"
+* [CB-11947](https://issues.apache.org/jira/browse/CB-11947) fixed typo that occurs when adding file-transfer plugin
+* [CB-11832](https://issues.apache.org/jira/browse/CB-11832) Incremented plugin version.
+
### 4.3.0 (Sep 08, 2016)
* [CB-11795](https://issues.apache.org/jira/browse/CB-11795) Add 'protective' entry to cordovaDependencies
* Add handling for `SecurityException`
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/db39e7cc/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 715d261..ffe1662 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-file",
- "version": "4.3.1-dev",
+ "version": "4.3.1",
"description": "Cordova File Plugin",
"cordova": {
"id": "cordova-plugin-file",
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/db39e7cc/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index aba8fee..51affa2 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,7 +21,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-file"
- version="4.3.1-dev">
+ version="4.3.1">
<name>File</name>
<description>Cordova File Plugin</description>
<license>Apache 2.0</license>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/db39e7cc/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index c3b0cba..29e531f 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -22,7 +22,7 @@
xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-file-tests"
- version="4.3.1-dev">
+ version="4.3.1">
<name>Cordova File Plugin Tests</name>
<license>Apache 2.0</license>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org