You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/01/29 20:07:52 UTC
[13/37] js commit: [all] Add ProgressEvent to file's symbols.js
[all] Add ProgressEvent to file's symbols.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/f7e7db84
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/f7e7db84
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/f7e7db84
Branch: refs/heads/symbolmapping
Commit: f7e7db845713d9f05f7cbd2268e6d839a3cc8a32
Parents: 7f6cf7b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 25 10:54:19 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jan 25 15:32:36 2013 -0500
----------------------------------------------------------------------
lib/common/common.js | 15 -------------
lib/common/plugin/file/symbolshelper.js | 1 +
lib/common/plugin/geolocation/symbols.js | 27 ++++++++++++++++++++++++
lib/ios/platform.js | 3 --
lib/ios/plugin/ios/geolocation/symbols.js | 23 ++++++++++++++++++++
lib/windows8/platform.js | 6 -----
6 files changed, 51 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f7e7db84/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index 7036d18..d5557e9 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -47,9 +47,6 @@ module.exports = {
notification: {
path: 'cordova/plugin/notification'
},
- geolocation: {
- path: 'cordova/plugin/geolocation'
- },
globalization: {
path: 'cordova/plugin/globalization'
},
@@ -69,9 +66,6 @@ module.exports = {
Connection: {
path: 'cordova/plugin/Connection'
},
- Coordinates: {
- path: 'cordova/plugin/Coordinates'
- },
device: {
path: 'cordova/plugin/device'
},
@@ -83,15 +77,6 @@ module.exports = {
},
MediaError: {
path: 'cordova/plugin/MediaError'
- },
- Position: {
- path: 'cordova/plugin/Position'
- },
- PositionError: {
- path: 'cordova/plugin/PositionError'
- },
- ProgressEvent: {
- path: 'cordova/plugin/ProgressEvent'
}
},
clobbers: {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f7e7db84/lib/common/plugin/file/symbolshelper.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/file/symbolshelper.js b/lib/common/plugin/file/symbolshelper.js
index 5ef5713..6ec35f1 100644
--- a/lib/common/plugin/file/symbolshelper.js
+++ b/lib/common/plugin/file/symbolshelper.js
@@ -35,6 +35,7 @@ module.exports = function(exportFunc) {
exportFunc('cordova/plugin/Flags', 'Flags');
exportFunc('cordova/plugin/LocalFileSystem', 'LocalFileSystem');
exportFunc('cordova/plugin/Metadata', 'Metadata');
+ exportFunc('cordova/plugin/ProgressEvent', 'ProgressEvent');
exportFunc('cordova/plugin/requestFileSystem', 'requestFileSystem');
exportFunc('cordova/plugin/resolveLocalFileSystemURI', 'resolveLocalFileSystemURI');
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f7e7db84/lib/common/plugin/geolocation/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/geolocation/symbols.js b/lib/common/plugin/geolocation/symbols.js
new file mode 100644
index 0000000..ee31422
--- /dev/null
+++ b/lib/common/plugin/geolocation/symbols.js
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+
+var modulemapper = require('cordova/modulemapper');
+
+modulemapper.defaults('cordova/plugin/geolocation', 'navigator.geolocation');
+modulemapper.clobbers('cordova/plugin/PositionError', 'PositionError');
+modulemapper.clobbers('cordova/plugin/Position', 'Position');
+modulemapper.clobbers('cordova/plugin/Coordinates', 'Coordinates');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f7e7db84/lib/ios/platform.js
----------------------------------------------------------------------
diff --git a/lib/ios/platform.js b/lib/ios/platform.js
index a196e7e..ce7e5e0 100644
--- a/lib/ios/platform.js
+++ b/lib/ios/platform.js
@@ -43,9 +43,6 @@ module.exports = {
children:{
notification:{
path:"cordova/plugin/ios/notification"
- },
- geolocation: {
- path: 'cordova/plugin/geolocation'
}
}
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f7e7db84/lib/ios/plugin/ios/geolocation/symbols.js
----------------------------------------------------------------------
diff --git a/lib/ios/plugin/ios/geolocation/symbols.js b/lib/ios/plugin/ios/geolocation/symbols.js
new file mode 100644
index 0000000..ce8d2e2
--- /dev/null
+++ b/lib/ios/plugin/ios/geolocation/symbols.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+var modulemapper = require('cordova/modulemapper');
+
+modulemapper.merges('cordova/plugin/geolocation', 'navigator.geolocation');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/f7e7db84/lib/windows8/platform.js
----------------------------------------------------------------------
diff --git a/lib/windows8/platform.js b/lib/windows8/platform.js
index d07016a..51caeca 100755
--- a/lib/windows8/platform.js
+++ b/lib/windows8/platform.js
@@ -91,12 +91,6 @@ module.exports = {
}
}
},
- Position:{
- path:'cordova/plugin/Position'
- },
- Coordinates:{
- path:'cordova/plugin/Coordinates'
- },
navigator: {
children: {
console: {