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
[24/37] js commit: [all] modulemapper refactor for media.
[all] modulemapper refactor for media.
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/a4b42244
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/a4b42244
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/a4b42244
Branch: refs/heads/symbolmapping
Commit: a4b42244cfd4aea8d5879f3199610e06f00caacb
Parents: 7166774
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 25 11:26:30 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jan 28 19:56:47 2013 -0500
----------------------------------------------------------------------
lib/android/platform.js | 3 --
lib/android/plugin/media/symbols.js | 25 ++++++++++++++++++
lib/blackberry/plugin/java/media/bbsymbols.js | 27 ++++++++++++++++++++
lib/blackberry/plugin/java/platform.js | 3 --
lib/common/common.js | 6 ----
lib/common/plugin/media/symbols.js | 25 ++++++++++++++++++
lib/ios/platform.js | 3 --
lib/ios/plugin/media/symbols.js | 25 ++++++++++++++++++
lib/tizen/platform.js | 3 --
lib/tizen/plugin/media/symbols.js | 26 +++++++++++++++++++
lib/windows8/platform.js | 3 --
lib/windows8/plugin/media/symbols.js | 25 ++++++++++++++++++
lib/windowsphone/platform.js | 3 --
lib/windowsphone/plugin/media/symbols.js | 26 +++++++++++++++++++
14 files changed, 179 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/android/platform.js
----------------------------------------------------------------------
diff --git a/lib/android/platform.js b/lib/android/platform.js
index 263ee20..2543fe5 100644
--- a/lib/android/platform.js
+++ b/lib/android/platform.js
@@ -105,9 +105,6 @@ module.exports = {
},
FileError: { //exists natively on Android WebView on Android 4.x
path: "cordova/plugin/FileError"
- },
- MediaError: { // exists natively on Android WebView on Android 4.x
- path: "cordova/plugin/MediaError"
}
},
merges: {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/android/plugin/media/symbols.js
----------------------------------------------------------------------
diff --git a/lib/android/plugin/media/symbols.js b/lib/android/plugin/media/symbols.js
new file mode 100644
index 0000000..2039a1f
--- /dev/null
+++ b/lib/android/plugin/media/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/Media', 'Media');
+modulemapper.clobbers('cordova/plugin/MediaError', 'MediaError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/blackberry/plugin/java/media/bbsymbols.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/java/media/bbsymbols.js b/lib/blackberry/plugin/java/media/bbsymbols.js
new file mode 100644
index 0000000..31d0d3a
--- /dev/null
+++ b/lib/blackberry/plugin/java/media/bbsymbols.js
@@ -0,0 +1,27 @@
+/*
+ * 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/Media', 'Media');
+modulemapper.defaults('cordova/plugin/MediaError', 'MediaError');
+// Exists natively on BB OS 6+, merge in Cordova specifics
+modulemapper.merges('cordova/plugin/java/MediaError', 'MediaError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/blackberry/plugin/java/platform.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/java/platform.js b/lib/blackberry/plugin/java/platform.js
index a6a0c21..d258fb4 100644
--- a/lib/blackberry/plugin/java/platform.js
+++ b/lib/blackberry/plugin/java/platform.js
@@ -161,9 +161,6 @@ module.exports = {
path: 'cordova/plugin/java/notification'
}
}
- },
- 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/a4b42244/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index 7dfe9af..5b46ee8 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -68,12 +68,6 @@ module.exports = {
},
GlobalizationError: {
path: 'cordova/plugin/GlobalizationError'
- },
- Media: {
- path: 'cordova/plugin/Media'
- },
- MediaError: {
- path: 'cordova/plugin/MediaError'
}
},
clobbers: {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/common/plugin/media/symbols.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/media/symbols.js b/lib/common/plugin/media/symbols.js
new file mode 100644
index 0000000..d97c647
--- /dev/null
+++ b/lib/common/plugin/media/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/Media', 'Media');
+modulemapper.defaults('cordova/plugin/MediaError', 'MediaError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/ios/platform.js
----------------------------------------------------------------------
diff --git a/lib/ios/platform.js b/lib/ios/platform.js
index eaa7cc0..6308dea 100644
--- a/lib/ios/platform.js
+++ b/lib/ios/platform.js
@@ -28,9 +28,6 @@ module.exports = {
modulemapper.mapModules(window);
},
clobbers: {
- MediaError: { // exists natively, override
- path: "cordova/plugin/MediaError"
- },
console: {
path: 'cordova/plugin/ios/console'
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/ios/plugin/media/symbols.js
----------------------------------------------------------------------
diff --git a/lib/ios/plugin/media/symbols.js b/lib/ios/plugin/media/symbols.js
new file mode 100644
index 0000000..2039a1f
--- /dev/null
+++ b/lib/ios/plugin/media/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/Media', 'Media');
+modulemapper.clobbers('cordova/plugin/MediaError', 'MediaError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/tizen/platform.js
----------------------------------------------------------------------
diff --git a/lib/tizen/platform.js b/lib/tizen/platform.js
index 2c64b33..ce1fa97 100644
--- a/lib/tizen/platform.js
+++ b/lib/tizen/platform.js
@@ -33,9 +33,6 @@ module.exports = {
}
},
merges: {
- MediaError: { // exists natively
- path: "cordova/plugin/tizen/MediaError"
- },
navigator: {
children: {
device: {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/tizen/plugin/media/symbols.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/media/symbols.js b/lib/tizen/plugin/media/symbols.js
new file mode 100644
index 0000000..2e12a08
--- /dev/null
+++ b/lib/tizen/plugin/media/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.defaults('cordova/plugin/Media', 'Media');
+modulemapper.defaults('cordova/plugin/MediaError', 'MediaError');
+modulemapper.merges('cordova/plugin/tizen/MediaError', 'MediaError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/windows8/platform.js
----------------------------------------------------------------------
diff --git a/lib/windows8/platform.js b/lib/windows8/platform.js
index 51caeca..1eb22ed 100755
--- a/lib/windows8/platform.js
+++ b/lib/windows8/platform.js
@@ -97,9 +97,6 @@ module.exports = {
path: "cordova/plugin/windows8/console"
}
}
- },
- MediaError: {
- path: 'cordova/plugin/MediaError'
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/windows8/plugin/media/symbols.js
----------------------------------------------------------------------
diff --git a/lib/windows8/plugin/media/symbols.js b/lib/windows8/plugin/media/symbols.js
new file mode 100644
index 0000000..2039a1f
--- /dev/null
+++ b/lib/windows8/plugin/media/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/Media', 'Media');
+modulemapper.clobbers('cordova/plugin/MediaError', 'MediaError');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/windowsphone/platform.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/platform.js b/lib/windowsphone/platform.js
index 6d23324..22b8c9e 100644
--- a/lib/windowsphone/platform.js
+++ b/lib/windowsphone/platform.js
@@ -52,9 +52,6 @@ module.exports = {
CordovaCommandResult: {
path:"cordova/plugin/windowsphone/CordovaCommandResult"
},
- CordovaMediaonStatus: {
- path:"cordova/plugin/windowsphone/CordovaMediaonStatus"
- },
navigator: {
children: {
console: {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a4b42244/lib/windowsphone/plugin/media/symbols.js
----------------------------------------------------------------------
diff --git a/lib/windowsphone/plugin/media/symbols.js b/lib/windowsphone/plugin/media/symbols.js
new file mode 100644
index 0000000..1b11941
--- /dev/null
+++ b/lib/windowsphone/plugin/media/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.defaults('cordova/plugin/Media', 'Media');
+modulemapper.defaults('cordova/plugin/MediaError', 'MediaError');
+modulemapper.clobbers('cordova/plugin/windowsphone/CordovaMediaonStatus', 'CordovaMediaonStatus');