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
[2/4] git commit: changing over beep overrides to use new merges
approach
changing over beep overrides to use new merges approach
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/7bd34971
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/7bd34971
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/7bd34971
Branch: refs/heads/master
Commit: 7bd3497122e4ec8e593e2481323f19fc9063a4a0
Parents: b42622f
Author: Fil Maj <ma...@gmail.com>
Authored: Fri Mar 16 16:27:30 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Fri Mar 16 16:27:30 2012 -0700
----------------------------------------------------------------------
lib/platform/ios.js | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/7bd34971/lib/platform/ios.js
----------------------------------------------------------------------
diff --git a/lib/platform/ios.js b/lib/platform/ios.js
index 830c3c5..e68b52e 100644
--- a/lib/platform/ios.js
+++ b/lib/platform/ios.js
@@ -8,9 +8,6 @@ module.exports = {
navigator.geolocation.getCurrentPosition = geo.getCurrentPosition;
navigator.geolocation.watchPosition = geo.watchPosition;
navigator.geolocation.clearWatch = geo.clearWatch;
- // Override Notification beep method with iOS-specific version.
- var notification = require('cordova/plugin/notification');
- notification.prototype.beep = require('cordova/plugin/ios/notification').beep;
},
objects: {
File: { // exists natively, override
@@ -32,6 +29,13 @@ module.exports = {
},
FileReader:{
path: "cordova/plugin/ios/FileReader"
+ },
+ navigator:{
+ children:{
+ notification:{
+ path:"cordova/plugin/ios/notification"
+ }
+ }
}
}
};