cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject js commit: [ios] Remove custom initialization of geolocation on navigator.
Date Wed, 21 Nov 2012 19:44:03 GMT
Updated Branches:
  refs/heads/master 7203d335b -> 3dcdf354e


[ios] Remove custom initialization of geolocation on navigator.

Now that we clobber navigator, this doesn't require special-casing.


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/3dcdf354
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/3dcdf354
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/3dcdf354

Branch: refs/heads/master
Commit: 3dcdf354e830be69ee50de9cda4489404ffb2114
Parents: 7203d33
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Wed Nov 21 14:43:17 2012 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Wed Nov 21 14:43:17 2012 -0500

----------------------------------------------------------------------
 lib/ios/platform.js |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/3dcdf354/lib/ios/platform.js
----------------------------------------------------------------------
diff --git a/lib/ios/platform.js b/lib/ios/platform.js
index 9a0f3c0..f3bdc64 100644
--- a/lib/ios/platform.js
+++ b/lib/ios/platform.js
@@ -22,13 +22,6 @@
 module.exports = {
     id: "ios",
     initialize:function() {
-        // iOS doesn't allow reassigning / overriding navigator.geolocation object.
-        // So clobber its methods here instead :)
-        var geo = require('cordova/plugin/geolocation');
-
-        navigator.geolocation.getCurrentPosition = geo.getCurrentPosition;
-        navigator.geolocation.watchPosition = geo.watchPosition;
-        navigator.geolocation.clearWatch = geo.clearWatch;
     },
     clobbers: {
         File: { // exists natively, override
@@ -64,7 +57,10 @@ module.exports = {
                 },
                 contacts:{
                     path:"cordova/plugin/ios/contacts"
-                }
+                },
+                geolocation: {
+                    path: 'cordova/plugin/geolocation'
+                },
             }
         }
     }


Mime
View raw message