Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F036DEA40 for ; Tue, 12 Feb 2013 19:33:10 +0000 (UTC) Received: (qmail 62563 invoked by uid 500); 12 Feb 2013 19:33:08 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 62517 invoked by uid 500); 12 Feb 2013 19:33:08 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 61820 invoked by uid 99); 12 Feb 2013 19:33:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Feb 2013 19:33:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 667FA51677; Tue, 12 Feb 2013 19:33:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [34/50] js commit: [all] modulemapper refactor for device. Message-Id: <20130212193307.667FA51677@tyr.zones.apache.org> Date: Tue, 12 Feb 2013 19:33:07 +0000 (UTC) [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/a24d53a2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/a24d53a2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/a24d53a2 Branch: refs/heads/symbolmapping Commit: a24d53a29cb5d2bc1bcda07e62667b2a62a5706f Parents: c8368eb Author: Andrew Grieve Authored: Fri Jan 25 15:16:00 2013 -0500 Committer: Andrew Grieve Committed: Tue Feb 12 13:44:50 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/a24d53a2/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/a24d53a2/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/a24d53a2/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/a24d53a2/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/a24d53a2/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/a24d53a2/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/a24d53a2/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/a24d53a2/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');