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/17 00:34:34 UTC
[4/4] git commit: using new merges object for prototype overriding
using new merges object for prototype overriding
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/27a84a1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/27a84a1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/27a84a1c
Branch: refs/heads/master
Commit: 27a84a1c369d7b3ee520cfc5d757687ae63559c2
Parents: 5659d93
Author: Fil Maj <ma...@gmail.com>
Authored: Fri Mar 16 16:23:41 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Fri Mar 16 16:23:41 2012 -0700
----------------------------------------------------------------------
lib/platform/ios.js | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/27a84a1c/lib/platform/ios.js
----------------------------------------------------------------------
diff --git a/lib/platform/ios.js b/lib/platform/ios.js
index 041ec9d..2d88e6c 100644
--- a/lib/platform/ios.js
+++ b/lib/platform/ios.js
@@ -8,14 +8,6 @@ module.exports = {
navigator.geolocation.getCurrentPosition = geo.getCurrentPosition;
navigator.geolocation.watchPosition = geo.watchPosition;
navigator.geolocation.clearWatch = geo.clearWatch;
-
- // Override Entry's toURL method with iOS platform-specific version.
- var Entry = require('cordova/plugin/Entry');
- Entry.prototype.toURL = require('cordova/plugin/ios/Entry').toURL;
-
- // Override FileReader's readAsText method with iOS-specific version.
- var FileReader = require('cordova/plugin/FileReader');
- FileReader.prototype.readAsText = require('cordova/plugin/ios/FileReader').readAsText;
},
objects: {
File: { // exists natively, override
@@ -30,5 +22,13 @@ module.exports = {
console: {
path: 'cordova/plugin/ios/console'
}
+ },
+ merges:{
+ Entry:{
+ path: "cordova/plugin/ios/Entry"
+ },
+ FileReader:{
+ path: "cordova/plugin/ios/FileReader"
+ }
}
};