You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/03/15 20:36:25 UTC
[9/21] git commit: tweaked ios-specific FileReader/Entry objects to
override the ios-specific methods over top common definitions for those
objects
tweaked ios-specific FileReader/Entry objects to override the ios-specific methods over top common definitions for those objects
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/a8b3624f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/a8b3624f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/a8b3624f
Branch: refs/heads/master
Commit: a8b3624f869334064414e78262059fb938e6a0ca
Parents: 5c5bf30
Author: Fil Maj <ma...@gmail.com>
Authored: Sat Mar 10 12:07:17 2012 -0800
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Mar 15 10:15:45 2012 -0700
----------------------------------------------------------------------
lib/platform/ios.js | 4 ++--
lib/plugin/Entry.js | 4 +---
lib/plugin/FileReader.js | 4 +---
3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/a8b3624f/lib/platform/ios.js
----------------------------------------------------------------------
diff --git a/lib/platform/ios.js b/lib/platform/ios.js
index b402633..17fd809 100644
--- a/lib/platform/ios.js
+++ b/lib/platform/ios.js
@@ -25,8 +25,8 @@ module.exports = {
path: "cordova/plugin/MediaError"
},
File: { // exists natively , override
- path: "cordova/plugin/File"
- },
+ path: "cordova/plugin/File"
+ },
device: {
path: 'cordova/plugin/ios/device'
},
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/a8b3624f/lib/plugin/Entry.js
----------------------------------------------------------------------
diff --git a/lib/plugin/Entry.js b/lib/plugin/Entry.js
index b3acd8a..f748dcc 100644
--- a/lib/plugin/Entry.js
+++ b/lib/plugin/Entry.js
@@ -152,9 +152,7 @@ Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallbac
*/
Entry.prototype.toURL = function() {
// fullPath attribute contains the full URL
- //return this.fullPath;
- // *** iOS specific
- return "file://localhost" + this.fullPath;
+ return this.fullPath;
};
/**
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/a8b3624f/lib/plugin/FileReader.js
----------------------------------------------------------------------
diff --git a/lib/plugin/FileReader.js b/lib/plugin/FileReader.js
index 6f7d422..8b634d9 100644
--- a/lib/plugin/FileReader.js
+++ b/lib/plugin/FileReader.js
@@ -100,9 +100,7 @@ FileReader.prototype.readAsText = function(file, encoding) {
}
// Save result
- //me.result = r;
- // *** iOS specific
- me.result = decodeURIComponent(r);
+ me.result = r;
// If onload callback
if (typeof me.onload === "function") {