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
[19/37] js commit: [all] modulemapper refactor for contacts.
[all] modulemapper refactor for contacts.
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/7f6cf7b7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/7f6cf7b7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/7f6cf7b7
Branch: refs/heads/symbolmapping
Commit: 7f6cf7b7ca7f9fc5699858d9272392917174f50f
Parents: 3cd215e
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Jan 24 22:22:41 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jan 25 15:32:36 2013 -0500
----------------------------------------------------------------------
lib/blackberry/plugin/java/contacts/bbsymbols.js | 25 +++++++++++++
lib/blackberry/plugin/java/platform.js | 6 ---
lib/common/common.js | 24 -------------
lib/common/plugin/contacts/symbols.js | 31 +++++++++++++++++
lib/ios/platform.js | 6 ---
lib/ios/plugin/ios/contacts/symbols.js | 26 ++++++++++++++
lib/tizen/platform.js | 6 ---
lib/tizen/plugin/tizen/contacts/symbols.js | 26 ++++++++++++++
8 files changed, 108 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/blackberry/plugin/java/contacts/bbsymbols.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/java/contacts/bbsymbols.js b/lib/blackberry/plugin/java/contacts/bbsymbols.js
new file mode 100644
index 0000000..dee7dd8
--- /dev/null
+++ b/lib/blackberry/plugin/java/contacts/bbsymbols.js
@@ -0,0 +1,25 @@
+/*
+ * 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/java/contacts', 'navigator.contacts');
+modulemapper.merges('cordova/plugin/java/Contact', 'Contact');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/blackberry/plugin/java/platform.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/java/platform.js b/lib/blackberry/plugin/java/platform.js
index f7dc0e4..a6a0c21 100644
--- a/lib/blackberry/plugin/java/platform.js
+++ b/lib/blackberry/plugin/java/platform.js
@@ -157,17 +157,11 @@ module.exports = {
merges: {
navigator: {
children: {
- contacts: {
- path: 'cordova/plugin/java/contacts'
- },
notification: {
path: 'cordova/plugin/java/notification'
}
}
},
- Contact: {
- path: 'cordova/plugin/java/Contact'
- },
MediaError: { // Exists natively on BB OS 6+, merge in Cordova specifics
path: 'cordova/plugin/java/MediaError'
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index e2eded1..7036d18 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -47,9 +47,6 @@ module.exports = {
notification: {
path: 'cordova/plugin/notification'
},
- contacts: {
- path: 'cordova/plugin/contacts'
- },
geolocation: {
path: 'cordova/plugin/geolocation'
},
@@ -72,27 +69,6 @@ module.exports = {
Connection: {
path: 'cordova/plugin/Connection'
},
- Contact: {
- path: 'cordova/plugin/Contact'
- },
- ContactAddress: {
- path: 'cordova/plugin/ContactAddress'
- },
- ContactError: {
- path: 'cordova/plugin/ContactError'
- },
- ContactField: {
- path: 'cordova/plugin/ContactField'
- },
- ContactFindOptions: {
- path: 'cordova/plugin/ContactFindOptions'
- },
- ContactName: {
- path: 'cordova/plugin/ContactName'
- },
- ContactOrganization: {
- path: 'cordova/plugin/ContactOrganization'
- },
Coordinates: {
path: 'cordova/plugin/Coordinates'
},
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/common/plugin/contacts/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/contacts/symbols.js b/lib/common/plugin/contacts/symbols.js
new file mode 100644
index 0000000..39391eb
--- /dev/null
+++ b/lib/common/plugin/contacts/symbols.js
@@ -0,0 +1,31 @@
+/*
+ * 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/contacts', 'navigator.contacts');
+modulemapper.clobbers('cordova/plugin/Contact', 'Contact');
+modulemapper.clobbers('cordova/plugin/ContactAddress', 'ContactAddress');
+modulemapper.clobbers('cordova/plugin/ContactError', 'ContactError');
+modulemapper.clobbers('cordova/plugin/ContactField', 'ContactField');
+modulemapper.clobbers('cordova/plugin/ContactFindOptions', 'ContactFindOptions');
+modulemapper.clobbers('cordova/plugin/ContactName', 'ContactName');
+modulemapper.clobbers('cordova/plugin/ContactOrganization', 'ContactOrganization');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/ios/platform.js
----------------------------------------------------------------------
diff --git a/lib/ios/platform.js b/lib/ios/platform.js
index 311aff3..a196e7e 100644
--- a/lib/ios/platform.js
+++ b/lib/ios/platform.js
@@ -39,17 +39,11 @@ module.exports = {
}
},
merges:{
- Contact:{
- path: "cordova/plugin/ios/Contact"
- },
navigator:{
children:{
notification:{
path:"cordova/plugin/ios/notification"
},
- contacts:{
- path:"cordova/plugin/ios/contacts"
- },
geolocation: {
path: 'cordova/plugin/geolocation'
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/ios/plugin/ios/contacts/symbols.js
----------------------------------------------------------------------
diff --git a/lib/ios/plugin/ios/contacts/symbols.js b/lib/ios/plugin/ios/contacts/symbols.js
new file mode 100644
index 0000000..ab18c92
--- /dev/null
+++ b/lib/ios/plugin/ios/contacts/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.
+ *
+*/
+
+require('cordova/plugin/contacts/symbols');
+
+var modulemapper = require('cordova/modulemapper');
+
+modulemapper.merges('cordova/plugin/ios/contacts', 'navigator.contacts');
+modulemapper.merges('cordova/plugin/ios/Contact', 'Contact');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/tizen/platform.js
----------------------------------------------------------------------
diff --git a/lib/tizen/platform.js b/lib/tizen/platform.js
index dea2b9f..2c64b33 100644
--- a/lib/tizen/platform.js
+++ b/lib/tizen/platform.js
@@ -41,16 +41,10 @@ module.exports = {
device: {
path: "cordova/plugin/tizen/Device"
},
- contacts: {
- path: "cordova/plugin/tizen/contacts"
- },
notification: {
path: "cordova/plugin/tizen/Notification"
}
}
- },
- Contact: {
- path: "cordova/plugin/tizen/Contact"
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7f6cf7b7/lib/tizen/plugin/tizen/contacts/symbols.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/tizen/contacts/symbols.js b/lib/tizen/plugin/tizen/contacts/symbols.js
new file mode 100644
index 0000000..bf62092
--- /dev/null
+++ b/lib/tizen/plugin/tizen/contacts/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.
+ *
+*/
+
+require('cordova/plugin/contacts/symbols');
+
+var modulemapper = require('cordova/modulemapper');
+
+modulemapper.merges('cordova/plugin/tizen/contacts', 'navigator.contacts');
+modulemapper.merges('cordova/plugin/tizen/Contact', 'Contact');