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
[22/37] js commit: [all] modulemapper refactor for device.
[all] modulemapper refactor for device.
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/b1f2ffa8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/b1f2ffa8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/b1f2ffa8
Branch: refs/heads/symbolmapping
Commit: b1f2ffa8811529572fb77c5d317f1ca1ed03df24
Parents: ae645d1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 25 15:16:00 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jan 28 19:56:47 2013 -0500
----------------------------------------------------------------------
lib/android/platform.js | 5 -----
lib/android/plugin/device/symbols.js | 25 +++++++++++++++++++++++++
lib/bada/platform.js | 14 --------------
lib/bada/plugin/device/symbols.js | 25 +++++++++++++++++++++++++
lib/common/common.js | 3 ---
lib/common/plugin/device/symbols.js | 24 ++++++++++++++++++++++++
lib/tizen/platform.js | 14 --------------
lib/tizen/plugin/device/symbols.js | 25 +++++++++++++++++++++++++
8 files changed, 99 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/android/platform.js
----------------------------------------------------------------------
diff --git a/lib/android/platform.js b/lib/android/platform.js
index 49c89d9..e4e80fb 100644
--- a/lib/android/platform.js
+++ b/lib/android/platform.js
@@ -97,10 +97,5 @@ module.exports = {
}
}
}
- },
- merges: {
- device: {
- path: 'cordova/plugin/android/device'
- }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/android/plugin/device/symbols.js
----------------------------------------------------------------------
diff --git a/lib/android/plugin/device/symbols.js b/lib/android/plugin/device/symbols.js
new file mode 100644
index 0000000..ad9a688
--- /dev/null
+++ b/lib/android/plugin/device/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/device', 'device');
+modulemapper.merges('cordova/plugin/android/device', 'device');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/bada/platform.js
----------------------------------------------------------------------
diff --git a/lib/bada/platform.js b/lib/bada/platform.js
index ffe1d89..a6087dd 100644
--- a/lib/bada/platform.js
+++ b/lib/bada/platform.js
@@ -26,19 +26,5 @@ module.exports = {
modulemapper.loadMatchingModules(/cordova.*\/symbols$/);
modulemapper.mapModules(window);
- },
- clobbers: {
- device: {
- path: 'cordova/plugin/bada/device'
- }
- },
- merges: {
- navigator: {
- children: {
- device: {
- path: "cordova/plugin/bada/device"
- }
- }
- }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/bada/plugin/device/symbols.js
----------------------------------------------------------------------
diff --git a/lib/bada/plugin/device/symbols.js b/lib/bada/plugin/device/symbols.js
new file mode 100644
index 0000000..68f91fa
--- /dev/null
+++ b/lib/bada/plugin/device/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/bada/device', 'device');
+modulemapper.merges('cordova/plugin/bada/device', 'navigator.device');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index 729811f..7c167c1 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -35,9 +35,6 @@ module.exports = {
path: 'cordova/exec'
}
}
- },
- device: {
- path: 'cordova/plugin/device'
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/common/plugin/device/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/device/symbols.js b/lib/common/plugin/device/symbols.js
new file mode 100644
index 0000000..4b779c0
--- /dev/null
+++ b/lib/common/plugin/device/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/device', 'device');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/tizen/platform.js
----------------------------------------------------------------------
diff --git a/lib/tizen/platform.js b/lib/tizen/platform.js
index 2e42f16..924813f 100644
--- a/lib/tizen/platform.js
+++ b/lib/tizen/platform.js
@@ -26,19 +26,5 @@ module.exports = {
modulemapper.loadMatchingModules(/cordova.*\/symbols$/);
modulemapper.mapModules(window);
- },
- clobbers: {
- device: {
- path: "cordova/plugin/tizen/Device"
- }
- },
- merges: {
- navigator: {
- children: {
- device: {
- path: "cordova/plugin/tizen/Device"
- }
- }
- }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b1f2ffa8/lib/tizen/plugin/device/symbols.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/device/symbols.js b/lib/tizen/plugin/device/symbols.js
new file mode 100644
index 0000000..80d416b
--- /dev/null
+++ b/lib/tizen/plugin/device/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/tizen/Device', 'device');
+modulemapper.merges('cordova/plugin/tizen/Device', 'navigator.device');