You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/12/05 02:00:15 UTC
[3/7] git commit: Added amazon-fireos platform. Change to use
amazon-fireos as a platform if the user agent string contains
'cordova-amazon-fireos'
Added amazon-fireos platform.
Change to use amazon-fireos as a platform if the user agent string contains 'cordova-amazon-fireos'
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/75f78b90
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/75f78b90
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/75f78b90
Branch: refs/heads/master
Commit: 75f78b90320dcad05e9e827f042728f0d4e38091
Parents: 0249265
Author: Archana Naik <na...@lab126.com>
Authored: Fri Oct 18 15:29:57 2013 -0700
Committer: Archana Naik <na...@lab126.com>
Committed: Wed Oct 30 14:51:44 2013 -0700
----------------------------------------------------------------------
plugin.xml | 11 +++++++++++
test/cordova-incl.js | 6 ++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/75f78b90/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 0629f79..8450c17 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -26,6 +26,17 @@
<source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" />
</platform>
+ <!-- amazon-fireos -->
+ <platform name="amazon-fireos">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="SplashScreen">
+ <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen"/>
+ </feature>
+ </config-file>
+
+ <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" />
+ </platform>
+
<!-- ios -->
<platform name="ios">
<config-file target="config.xml" parent="/*">
http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/75f78b90/test/cordova-incl.js
----------------------------------------------------------------------
diff --git a/test/cordova-incl.js b/test/cordova-incl.js
index dbcd1a6..d5c90fb 100644
--- a/test/cordova-incl.js
+++ b/test/cordova-incl.js
@@ -20,7 +20,9 @@
*/
var PLAT;
-if (/Android/.exec(navigator.userAgent)) {
+if (/cordova-amazon-fireos/.exec(navigator.userAgent)) {
+ PLAT = 'amazon-fireos';
+} else if (/Android/.exec(navigator.userAgent)) {
PLAT = 'android';
} else if (/(iPad)|(iPhone)|(iPod)/.exec(navigator.userAgent)) {
PLAT = 'ios';
@@ -61,7 +63,7 @@ if (!window._doNotWriteCordovaScript) {
}
function backHome() {
- if (window.device && device.platform && device.platform.toLowerCase() == 'android') {
+ if (window.device && device.platform && (device.platform.toLowerCase() == 'android' || device.platform.toLowerCase() == 'amazon-fireos')) {
navigator.app.backHistory();
}
else {