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
[20/37] js commit: [all] modulemapper refactor for notification.
[all] modulemapper refactor for notification.
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/aa17f80f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/aa17f80f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/aa17f80f
Branch: refs/heads/symbolmapping
Commit: aa17f80faa9f89fb334882c6ae91e2ebe588bb1d
Parents: a37477c
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 25 13:45:41 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jan 28 19:56:47 2013 -0500
----------------------------------------------------------------------
lib/android/platform.js | 7 ----
lib/android/plugin/notification/symbols.js | 25 +++++++++++++++
lib/bada/platform.js | 7 ----
lib/bada/plugin/notification/symbols.js | 24 ++++++++++++++
.../plugin/java/notification/bbsymbols.js | 24 ++++++++++++++
lib/blackberry/plugin/java/platform.js | 9 -----
lib/common/common.js | 9 -----
lib/common/plugin/globalization/symbols.js | 24 ++++++++++++++
lib/common/plugin/notification/symbols.js | 24 ++++++++++++++
lib/ios/platform.js | 9 -----
lib/ios/plugin/notification/symbols.js | 25 +++++++++++++++
lib/tizen/platform.js | 5 +--
lib/tizen/plugin/notification/symbols.js | 25 +++++++++++++++
lib/webos/platform.js | 3 --
lib/webos/plugin/notification/symbols.js | 25 +++++++++++++++
15 files changed, 197 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/android/platform.js
----------------------------------------------------------------------
diff --git a/lib/android/platform.js b/lib/android/platform.js
index ac54d5e..49c89d9 100644
--- a/lib/android/platform.js
+++ b/lib/android/platform.js
@@ -101,13 +101,6 @@ module.exports = {
merges: {
device: {
path: 'cordova/plugin/android/device'
- },
- navigator: {
- children: {
- notification: {
- path: 'cordova/plugin/android/notification'
- }
- }
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/android/plugin/notification/symbols.js
----------------------------------------------------------------------
diff --git a/lib/android/plugin/notification/symbols.js b/lib/android/plugin/notification/symbols.js
new file mode 100644
index 0000000..c639dc2
--- /dev/null
+++ b/lib/android/plugin/notification/symbols.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.clobbers('cordova/plugin/notification', 'navigator.notification');
+modulemapper.merges('cordova/plugin/android/notification', 'navigator.notification');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/bada/platform.js
----------------------------------------------------------------------
diff --git a/lib/bada/platform.js b/lib/bada/platform.js
index b980fe4..ffe1d89 100644
--- a/lib/bada/platform.js
+++ b/lib/bada/platform.js
@@ -30,13 +30,6 @@ module.exports = {
clobbers: {
device: {
path: 'cordova/plugin/bada/device'
- },
- navigator: {
- children: {
- notification: {
- path: "cordova/plugin/bada/Notification"
- }
- }
}
},
merges: {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/bada/plugin/notification/symbols.js
----------------------------------------------------------------------
diff --git a/lib/bada/plugin/notification/symbols.js b/lib/bada/plugin/notification/symbols.js
new file mode 100644
index 0000000..578f5df
--- /dev/null
+++ b/lib/bada/plugin/notification/symbols.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.clobbers('cordova/plugin/bada/Notification', 'navigator.notification');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/blackberry/plugin/java/notification/bbsymbols.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/java/notification/bbsymbols.js b/lib/blackberry/plugin/java/notification/bbsymbols.js
new file mode 100644
index 0000000..31c8e0a
--- /dev/null
+++ b/lib/blackberry/plugin/java/notification/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/java/notification', 'navigator.notification');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/blackberry/plugin/java/platform.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/java/platform.js b/lib/blackberry/plugin/java/platform.js
index d258fb4..2eefada 100644
--- a/lib/blackberry/plugin/java/platform.js
+++ b/lib/blackberry/plugin/java/platform.js
@@ -153,14 +153,5 @@ module.exports = {
}
}
}
- },
- merges: {
- navigator: {
- children: {
- notification: {
- path: 'cordova/plugin/java/notification'
- }
- }
- }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index 5b46ee8..37f233d 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -41,12 +41,6 @@ module.exports = {
},
navigator: {
children: {
- notification: {
- path: 'cordova/plugin/notification'
- },
- globalization: {
- path: 'cordova/plugin/globalization'
- },
network: {
children: {
connection: {
@@ -65,9 +59,6 @@ module.exports = {
},
device: {
path: 'cordova/plugin/device'
- },
- GlobalizationError: {
- path: 'cordova/plugin/GlobalizationError'
}
},
clobbers: {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/common/plugin/globalization/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/globalization/symbols.js b/lib/common/plugin/globalization/symbols.js
new file mode 100644
index 0000000..064d1a0
--- /dev/null
+++ b/lib/common/plugin/globalization/symbols.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.defaults('cordova/plugin/globalization', 'navigator.globalization');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/common/plugin/notification/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/notification/symbols.js b/lib/common/plugin/notification/symbols.js
new file mode 100644
index 0000000..e4d249b
--- /dev/null
+++ b/lib/common/plugin/notification/symbols.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.defaults('cordova/plugin/notification', 'navigator.notification');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/ios/platform.js
----------------------------------------------------------------------
diff --git a/lib/ios/platform.js b/lib/ios/platform.js
index 6308dea..a8f876e 100644
--- a/lib/ios/platform.js
+++ b/lib/ios/platform.js
@@ -31,15 +31,6 @@ module.exports = {
console: {
path: 'cordova/plugin/ios/console'
}
- },
- merges:{
- navigator:{
- children:{
- notification:{
- path:"cordova/plugin/ios/notification"
- }
- }
- }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/ios/plugin/notification/symbols.js
----------------------------------------------------------------------
diff --git a/lib/ios/plugin/notification/symbols.js b/lib/ios/plugin/notification/symbols.js
new file mode 100644
index 0000000..c80f18d
--- /dev/null
+++ b/lib/ios/plugin/notification/symbols.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.clobbers('cordova/plugin/notification', 'navigator.notification');
+modulemapper.merges('cordova/plugin/ios/notification', 'navigator.notification');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/tizen/platform.js
----------------------------------------------------------------------
diff --git a/lib/tizen/platform.js b/lib/tizen/platform.js
index ce1fa97..2e42f16 100644
--- a/lib/tizen/platform.js
+++ b/lib/tizen/platform.js
@@ -37,10 +37,7 @@ module.exports = {
children: {
device: {
path: "cordova/plugin/tizen/Device"
- },
- notification: {
- path: "cordova/plugin/tizen/Notification"
- }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/tizen/plugin/notification/symbols.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/notification/symbols.js b/lib/tizen/plugin/notification/symbols.js
new file mode 100644
index 0000000..92fafbf
--- /dev/null
+++ b/lib/tizen/plugin/notification/symbols.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.defaults('cordova/plugin/notification', 'navigator.notification');
+modulemapper.merges('cordova/plugin/tizen/Notification', 'navigator.notification');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/webos/platform.js
----------------------------------------------------------------------
diff --git a/lib/webos/platform.js b/lib/webos/platform.js
index baa3457..49ee383 100644
--- a/lib/webos/platform.js
+++ b/lib/webos/platform.js
@@ -111,9 +111,6 @@ module.exports = {
window: {
path: "cordova/plugin/webos/window"
},
- notification: {
- path: "cordova/plugin/webos/notification"
- },
orientation: {
path: "cordova/plugin/webos/orientation"
},
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/aa17f80f/lib/webos/plugin/notification/symbols.js
----------------------------------------------------------------------
diff --git a/lib/webos/plugin/notification/symbols.js b/lib/webos/plugin/notification/symbols.js
new file mode 100644
index 0000000..dc5114e
--- /dev/null
+++ b/lib/webos/plugin/notification/symbols.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.defaults('cordova/plugin/notification', 'navigator.notification');
+modulemapper.merges('cordova/plugin/webos/notification', 'navigator.notification');