public/cordova-plugin-splashscreen
public/cordova-plugin-splashscreen
8
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:archananaik/cordova-plugin-splashscreen into dev

Browse Source
This commit is contained in:
Steven Gill 2013-11-26 16:45:45 -08:00
commit b998129669
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugin.xml
View File

@ -26,6 +26,17 @@
<source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" /> <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" />
</platform> </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 --> <!-- ios -->
<platform name="ios"> <platform name="ios">
<config-file target="config.xml" parent="/*"> <config-file target="config.xml" parent="/*">

6
test/cordova-incl.js vendored
View File

@ -20,7 +20,9 @@
*/ */
var PLAT; 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'; PLAT = 'android';
} else if (/(iPad)|(iPhone)|(iPod)/.exec(navigator.userAgent)) { } else if (/(iPad)|(iPhone)|(iPod)/.exec(navigator.userAgent)) {
PLAT = 'ios'; PLAT = 'ios';
@ -61,7 +63,7 @@ if (!window._doNotWriteCordovaScript) {
} }
function backHome() { 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(); navigator.app.backHistory();
} }
else { else {