summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-07-29 20:49:55 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-07-29 20:49:55 -0400
commita6b7582785a396f059be7e901b56845477140558 (patch)
treef67fcac7e21e4426743d95060326fdb7350ac353
parent806142bbcffad1d8056c7d4710be4277df8f04fb (diff)
switched back to cordovahidesplashscreen to take control of splash and remove white screen
-rw-r--r--config.xml5
-rw-r--r--www/js/app.js4
2 files changed, 5 insertions, 4 deletions
diff --git a/config.xml b/config.xml
index 23eec92b..ac9d301c 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.pliablepixels.zmninja" version="0.66" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.pliablepixels.zmninja" version="0.67" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>zmNinja</name>
<description>
High performance ZoneMinder client
@@ -15,7 +15,8 @@
<preference name="UIWebViewBounce" value="false"/>
<preference name="DisallowOverscroll" value="true"/>
<preference name="BackupWebStorage" value="none"/>
- <preference name="AutoHideSplashScreen" value="true"/>
+ <preference name="AutoHideSplashScreen" value="false"/>
+ <preference name="ShowSplashScreenSpinner" value="false"/>
<preference name="SplashScreen" value="screen"/>
<preference name="deployment-target" value="7.0"/>
<preference name="SplashScreenDelay" value="3000"/>
diff --git a/www/js/app.js b/www/js/app.js
index d90a25c0..a9f0b571 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -402,12 +402,12 @@ angular.module('zmApp', [
}
- /*setTimeout(function () {
+ setTimeout(function () {
if (window.cordova)
{
$cordovaSplashscreen.hide();
}
- }, 1500);*/
+ }, 1500);
if(window.navigator && window.navigator.splashscreen) {
window.navigator.splashscreen.hide();