You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/02/11 00:22:45 UTC

[19/50] git commit: CB-5008: Rename resolveLocalFileSystemURI to resolveLocalFileSystemURL; deprecate original

CB-5008: Rename resolveLocalFileSystemURI to resolveLocalFileSystemURL; deprecate original


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

Branch: refs/heads/master
Commit: 9ec003a0a5678db1a54aacf74d0db416a2833803
Parents: 89e6e62
Author: Ian Clelland <ic...@chromium.org>
Authored: Sat Jan 11 09:43:08 2014 -0500
Committer: Ian Clelland <ic...@chromium.org>
Committed: Sat Jan 11 09:43:08 2014 -0500

----------------------------------------------------------------------
 plugin.xml                       | 2 +-
 www/resolveLocalFileSystemURI.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/9ec003a0/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index e8e6ba6..f5d215a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -79,7 +79,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
     </js-module>
 
     <js-module src="www/resolveLocalFileSystemURI.js" name="resolveLocalFileSystemURI">
-        <clobbers target="window.resolveLocalFileSystemURI" />
+        <merges target="window" />
     </js-module>
 
     <!-- android -->

http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/9ec003a0/www/resolveLocalFileSystemURI.js
----------------------------------------------------------------------
diff --git a/www/resolveLocalFileSystemURI.js b/www/resolveLocalFileSystemURI.js
index 8bfbfe2..3d3b1dc 100644
--- a/www/resolveLocalFileSystemURI.js
+++ b/www/resolveLocalFileSystemURI.js
@@ -31,7 +31,7 @@ var argscheck = require('cordova/argscheck'),
  * @param successCallback  invoked with Entry object corresponding to URI
  * @param errorCallback    invoked if error occurs retrieving file system entry
  */
-module.exports = function(uri, successCallback, errorCallback) {
+module.exports.resolveLocalFileSystemURL = function(uri, successCallback, errorCallback) {
     argscheck.checkArgs('sFF', 'resolveLocalFileSystemURI', arguments);
     // error callback
     var fail = function(error) {
@@ -63,3 +63,7 @@ module.exports = function(uri, successCallback, errorCallback) {
 
     exec(success, fail, "File", "resolveLocalFileSystemURI", [uri]);
 };
+module.exports.resolveLocalFileSystemURI = function() {
+    console.log("resolveLocalfileSystemURI is deprecated. Please call reolvelLocalFileSystemURL instead");
+    module.exports.resolveLocalFileSystemURL.apply(this, arguments);
+};