You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/10/20 01:42:56 UTC

[1/2] cordova-plugin-file git commit: override resolveLocalFileSystemURL by webkitResolveLocalFileSystemURL for browser platform add .project into git ignore list

Repository: cordova-plugin-file
Updated Branches:
  refs/heads/master 0f8c893e1 -> affe36086


override resolveLocalFileSystemURL by webkitResolveLocalFileSystemURL
for browser platform
add .project into git ignore list

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/ef791ed4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/ef791ed4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/ef791ed4

Branch: refs/heads/master
Commit: ef791ed4f142b94e0c3d4a9cdd18a42bb30267c1
Parents: 5f88e01
Author: Tommy Tang <tw...@gmail.com>
Authored: Mon Sep 21 14:02:01 2015 +0800
Committer: Tommy Tang <tw...@gmail.com>
Committed: Mon Sep 21 14:02:01 2015 +0800

----------------------------------------------------------------------
 .gitignore                       | 10 +---------
 www/resolveLocalFileSystemURI.js |  6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/ef791ed4/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 52b558e..457e879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,12 +12,4 @@ Thumbs.db
 *.swp
 *.user
 
-
-
-
-
-
-
-
-
- 
\ No newline at end of file
+/.project
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/ef791ed4/www/resolveLocalFileSystemURI.js
----------------------------------------------------------------------
diff --git a/www/resolveLocalFileSystemURI.js b/www/resolveLocalFileSystemURI.js
index dd6f90c..f564f78 100644
--- a/www/resolveLocalFileSystemURI.js
+++ b/www/resolveLocalFileSystemURI.js
@@ -22,8 +22,8 @@
 //For browser platform: not all browsers use overrided `resolveLocalFileSystemURL`.
 function checkBrowser() {
     if (cordova.platformId === "browser" && navigator.userAgent.search(/Chrome/) > 0) {
-        var requestFileSystem  = window.requestFileSystem || window.webkitRequestFileSystem;
-        module.exports = requestFileSystem;
+        var resolveLocalFileSystemURL  = window.resolveLocalFileSystemURL || window.webkitResolveLocalFileSystemURL;
+        module.exports.resolveLocalFileSystemURL = resolveLocalFileSystemURL;
         return;
     }
 }
@@ -42,7 +42,7 @@ var fileSystems = require('./fileSystems');
  * @param successCallback  invoked with Entry object corresponding to URI
  * @param errorCallback    invoked if error occurs retrieving file system entry
  */
-module.exports.resolveLocalFileSystemURL = function(uri, successCallback, errorCallback) {
+module.exports.resolveLocalFileSystemURL = module.exports.resolveLocalFileSystemURL || function(uri, successCallback, errorCallback) {
     argscheck.checkArgs('sFF', 'resolveLocalFileSystemURI', arguments);
     // error callback
     var fail = function(error) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org

[2/2] cordova-plugin-file git commit: added back newline

Posted by pu...@apache.org.
added back newline


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/affe3608
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/affe3608
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/affe3608

Branch: refs/heads/master
Commit: affe360861e5e4c8e3ff72f9fea2450b8379e4f9
Parents: 0f8c893 ef791ed
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Oct 19 16:32:06 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Oct 19 16:42:15 2015 -0700

----------------------------------------------------------------------
 .gitignore                       | 10 +---------
 www/resolveLocalFileSystemURI.js |  6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/affe3608/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 52b558e,457e879..9752a6f
--- a/.gitignore
+++ b/.gitignore
@@@ -12,12 -12,4 +12,4 @@@ Thumbs.d
  *.swp
  *.user
  
- 
- 
- 
- 
- 
- 
- 
- 
-  
 -/.project
++/.project


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org