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
[21/37] js commit: [all] modulemapper refactor for splashscreen.
[all] modulemapper refactor for splashscreen.
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/0d31cd43
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/0d31cd43
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/0d31cd43
Branch: refs/heads/symbolmapping
Commit: 0d31cd43c295096cb52aa30b567d11f74b1ea76e
Parents: aa17f80
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 25 13:49:57 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jan 28 19:56:47 2013 -0500
----------------------------------------------------------------------
lib/common/common.js | 27 -----------------------
lib/common/plugin/globalization/symbols.js | 3 +-
lib/common/plugin/networkstatus/symbols.js | 26 ++++++++++++++++++++++
lib/common/plugin/splashscreen/symbols.js | 24 ++++++++++++++++++++
4 files changed, 52 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0d31cd43/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index 37f233d..a47c5f3 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -39,35 +39,8 @@ module.exports = {
}
}
},
- navigator: {
- children: {
- network: {
- children: {
- connection: {
- path: 'cordova/plugin/network',
- deprecated: 'navigator.network.connection is deprecated. Use navigator.connection instead.'
- }
- }
- },
- splashscreen: {
- path: 'cordova/plugin/splashscreen'
- }
- }
- },
- Connection: {
- path: 'cordova/plugin/Connection'
- },
device: {
path: 'cordova/plugin/device'
}
- },
- clobbers: {
- navigator: {
- children: {
- connection: {
- path: 'cordova/plugin/network'
- }
- }
- }
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0d31cd43/lib/common/plugin/globalization/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/globalization/symbols.js b/lib/common/plugin/globalization/symbols.js
index 064d1a0..8ccf1b2 100644
--- a/lib/common/plugin/globalization/symbols.js
+++ b/lib/common/plugin/globalization/symbols.js
@@ -21,4 +21,5 @@
var modulemapper = require('cordova/modulemapper');
-modulemapper.defaults('cordova/plugin/globalization', 'navigator.globalization');
+modulemapper.clobbers('cordova/plugin/globalization', 'navigator.globalization');
+modulemapper.clobbers('cordova/plugin/GlobalizationError', 'GlobalizationError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0d31cd43/lib/common/plugin/networkstatus/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/networkstatus/symbols.js b/lib/common/plugin/networkstatus/symbols.js
new file mode 100644
index 0000000..8ca64c1
--- /dev/null
+++ b/lib/common/plugin/networkstatus/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/network', 'navigator.network.connection', 'navigator.network.connection is deprecated. Use navigator.connection instead.');
+modulemapper.clobbers('cordova/plugin/network', 'navigator.connection');
+modulemapper.defaults('cordova/plugin/Connection', 'Connection');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0d31cd43/lib/common/plugin/splashscreen/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/splashscreen/symbols.js b/lib/common/plugin/splashscreen/symbols.js
new file mode 100644
index 0000000..bcca25e
--- /dev/null
+++ b/lib/common/plugin/splashscreen/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/splashscreen', 'navigator.splashscreen');