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
[16/37] js commit: [all] modulemapper refactor for compass.
[all] modulemapper refactor for compass.
https://issues.apache.org/jira/browse/CB-2227
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/3cd215e9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/3cd215e9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/3cd215e9
Branch: refs/heads/symbolmapping
Commit: 3cd215e90a748c8bc40b7981898adc65705646c7
Parents: 44e30a6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Jan 24 22:12:44 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jan 25 15:32:36 2013 -0500
----------------------------------------------------------------------
lib/blackberry/plugin/qnx/compass/bbsymbols.js | 24 +++++++++++++++++
lib/blackberry/plugin/qnx/platform.js | 9 ------
lib/common/common.js | 9 ------
lib/common/plugin/compass/symbols.js | 26 +++++++++++++++++++
4 files changed, 50 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/3cd215e9/lib/blackberry/plugin/qnx/compass/bbsymbols.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/qnx/compass/bbsymbols.js b/lib/blackberry/plugin/qnx/compass/bbsymbols.js
new file mode 100644
index 0000000..ad46a27
--- /dev/null
+++ b/lib/blackberry/plugin/qnx/compass/bbsymbols.js
@@ -0,0 +1,24 @@
+/*
+ * 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/qnx/compass', 'navigator.compass');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/3cd215e9/lib/blackberry/plugin/qnx/platform.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/qnx/platform.js b/lib/blackberry/plugin/qnx/platform.js
index 50ded05..40d309f 100644
--- a/lib/blackberry/plugin/qnx/platform.js
+++ b/lib/blackberry/plugin/qnx/platform.js
@@ -45,14 +45,5 @@ module.exports = {
open: {
path: "cordova/plugin/InAppBrowser"
}
- },
- merges: {
- navigator: {
- children: {
- compass: {
- path: 'cordova/plugin/qnx/compass'
- }
- }
- }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/3cd215e9/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index 3a5c11b..e2eded1 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -47,9 +47,6 @@ module.exports = {
notification: {
path: 'cordova/plugin/notification'
},
- compass:{
- path: 'cordova/plugin/compass'
- },
contacts: {
path: 'cordova/plugin/contacts'
},
@@ -72,12 +69,6 @@ module.exports = {
}
}
},
- CompassHeading:{
- path: 'cordova/plugin/CompassHeading'
- },
- CompassError:{
- path: 'cordova/plugin/CompassError'
- },
Connection: {
path: 'cordova/plugin/Connection'
},
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/3cd215e9/lib/common/plugin/compass/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/compass/symbols.js b/lib/common/plugin/compass/symbols.js
new file mode 100644
index 0000000..0ebfd9c
--- /dev/null
+++ b/lib/common/plugin/compass/symbols.js
@@ -0,0 +1,26 @@
+/*
+ * 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.clobbers('cordova/plugin/CompassHeading', 'CompassHeading');
+modulemapper.clobbers('cordova/plugin/CompassError', 'CompassError');
+modulemapper.clobbers('cordova/plugin/compass', 'navigator.compass');