spacing

80 files changed, 338 insertions, 206 deletions

diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index 0d747972..aa055a93 100755
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -29,6 +29,8 @@
     <preference name="StatusBarBackgroundColor" value="#000000" />
     <preference name="StatusBarStyle" value="lightcontent" />
     <preference name="SplashMaintainAspectRatio" value="true" />
+    <preference name="ShowSplashScreenSpinner" value="false"/>
+    <preference name="AutoHideSplashScreen" value="false" />
 
     <platform name="android">
         <allow-intent href="market:*" />
diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml
index ac905064..9dd17db8 100755
--- a/StoneIsland/platforms/android/AndroidManifest.xml
+++ b/StoneIsland/platforms/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="404" android:versionName="0.4.4" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="500" android:versionName="0.5.0" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/StoneIsland/platforms/android/assets/www/js/index.js b/StoneIsland/platforms/android/assets/www/js/index.js
index 050a729c..73af443a 100755
--- a/StoneIsland/platforms/android/assets/www/js/index.js
+++ b/StoneIsland/platforms/android/assets/www/js/index.js
@@ -3,7 +3,7 @@ var app = (function(){
   
   app.init = function(){  
 
-    sdk.init({ env: "production" })
+    sdk.init({ env: "test" })
 
     app.bind()
     app.build()
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js
index 5a036930..e7211036 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js
@@ -36,6 +36,7 @@ var ArchiveView = ScrollableView.extend({
     var index = $(e.currentTarget).data("index")
     this.$subtitle.html( $(e.currentTarget).text() )
     this.populateDecade(index)
+    this.deferScrollToTop()
   },
   
   show: function(){
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
index dae7f98d..4ed05bb8 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
@@ -25,13 +25,22 @@ var HubView = ScrollableView.extend({
 
   galleries: {},
   populate: function(data){
-    this.data = data
+    // sort posts by date, reversed
+    this.data = data.map(function(s){
+      return [ +moment(s.date), s ]
+    }).sort(function(a,b){
+      return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1
+    }).map(function(pair){
+      console.log(pair[1])
+      return pair[1]
+    })
     this.$loader.hide()
     this.$content.empty()
     this.galleries = {}
     // id date subtitle body link store image[uri caption]
     this.data.forEach(function(row){
       // console.log(row)
+      console.log(moment(row.date))
       var t = this.template.replace(/{{id}}/g, row.id)
                            .replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY"))
                            .replace(/{{title}}/, row.title)
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/etc/geo.js b/StoneIsland/platforms/android/assets/www/js/lib/etc/geo.js
index fac34c1e..88521bb1 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/etc/geo.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/etc/geo.js
@@ -1,23 +1,49 @@
 var geo = (function(){
   var geo = {}
   
+  var polling = false, fetching = false, poll_timeout = null
+  
   geo.fetch = function(){
+    fetching = true
     navigator.geolocation.getCurrentPosition(geo.success, geo.error, {timeout: 15000})
   }
   
   geo.success = function(position){
-    var lat_str = as_degrees( position.coords.latitude || 40.99167 )
-    var lng_str = as_degrees( position.coords.longitude || -74.07944 )
+    var lat_str = as_degrees( position.coords.latitude || 40.99167, "N", "S" )
+    var lng_str = as_degrees( position.coords.longitude || -74.07944, "W", "E" )
     $(".latlng").html( lat_str + " " + lng_str )
+    geo.done()
   }
   
   geo.error = function(error){
-    $(".latlng").html( "+40&deg; 58' 90\" -74&deg; 04' 46\"" )
+    $(".latlng").html( "+40&deg; 58' 90.9\" N 74&deg; 04' 46.3\" W" )
+    geo.done()
+  }
+  
+  geo.done = function(){
+    fetching = false
+    if (polling) {
+      clearTimeout( poll_timeout )
+      poll_timeout = setTimeout(geo.fetch, 15000)
+    }
+  }
+  
+  geo.start_polling = function(){
+    polling = true
+    if (! fetching) {
+      geo.fetch()
+    }
+  }
+  
+  geo.stop_polling = function(){
+    polling = false
+    clearTimeout(poll_timeout)
   }
   
-  function as_degrees (n) {
+  function as_degrees (n, pos, neg) {
     var s = ""
-    if (n >= 0) s += "+"
+    var sig = n >= 0 ? pos : neg
+    
     s += Math.floor(n) + "&deg; "
     
     n = Math.abs(n)
@@ -31,7 +57,13 @@ var geo = (function(){
     n *= 60
     nn = Math.floor(n)
     if (nn < 10) nn = "0" + nn
-    s += nn + '"'
+    s += nn
+    
+    n %= 1
+    n *= 10
+    nn = Math.floor(n)
+    s += "." + nn + '\" ' + sig
+    
     return s
   }
 
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js
index 5e5ea908..c075619a 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js
@@ -21,14 +21,13 @@ var IntroView = View.extend({
     window.addEventListener("deviceorientation", this.orient)
     app.footer.hide()
     this.orient({ alpha: 0 })
-    // get location..
   },
-
+  
   hide: function(){
     window.removeEventListener("deviceorientation", this.orient)
     this.$alert.hide()
   },
-
+  
   deviceorientation: function(e){
     var heading
     if ('webkitCompassHeading' in e) {
@@ -61,5 +60,5 @@ var IntroView = View.extend({
     e.stopPropagation()
     app.router.go("archive") 
   },
-
+  
 })
diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml
index 7bcd705b..20661d26 100755
--- a/StoneIsland/platforms/android/res/xml/config.xml
+++ b/StoneIsland/platforms/android/res/xml/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.4.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <preference name="loglevel" value="DEBUG" />
     <feature name="Keyboard">
         <param name="android-package" value="com.ionic.keyboard.IonicKeyboard" />
@@ -65,4 +65,5 @@
     <preference name="StatusBarOverlaysWebView" value="false" />
     <preference name="StatusBarBackgroundColor" value="#000000" />
     <preference name="StatusBarStyle" value="lightcontent" />
+    <preference name="SplashMaintainAspectRatio" value="true" />
 </widget>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index c52b46e5..c9da823b 100755
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -78,4 +78,6 @@
     <preference name="StatusBarBackgroundColor" value="#000000" />
     <preference name="StatusBarStyle" value="lightcontent" />
     <preference name="SplashMaintainAspectRatio" value="true" />
+    <preference name="ShowSplashScreenSpinner" value="false" />
+    <preference name="AutoHideSplashScreen" value="false" />
 </widget>
diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html
index b9dd0a91..2a588826 100755
--- a/StoneIsland/platforms/ios/www/index.html
+++ b/StoneIsland/platforms/ios/www/index.html
@@ -103,7 +103,7 @@
     <div class="story">STORY</div>
     <div class="archive">ARCHIVE</div>
     <div class="alert"></div>
-    <span class="latlng">+40&deg; 58' 90" -74&deg; 04' 46"</span>
+    <span class="latlng">+40&deg; 58' 90.9" N&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;74&deg; 04' 46.3" W</span>
   </div>
 
   <div id="header">
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js
index 73af443a..0770b0f6 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -79,8 +79,6 @@ var app = (function(){
     push.init()
     app.account.connect( app.router.launch.bind(app.router) )
 //     }
-    
-    $("body").removeClass("loading")
   }
   
   var refresh_time = +Date.now()
diff --git a/StoneIsland/platforms/ios/www/js/lib/_router.js b/StoneIsland/platforms/ios/www/js/lib/_router.js
index b1fa1c97..6ec14825 100755
--- a/StoneIsland/platforms/ios/www/js/lib/_router.js
+++ b/StoneIsland/platforms/ios/www/js/lib/_router.js
@@ -58,6 +58,11 @@ var SiteRouter = Router.extend({
       this.route()
 	  }
 	  this.initial_route = null
+    
+    if (window.cordova) {
+      navigator.splashscreen.hide()
+    }
+    $("body").removeClass("loading")
 	},
 
   go: function(url){
diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js
index 88521bb1..5af9ecfd 100755
--- a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js
+++ b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js
@@ -11,12 +11,12 @@ var geo = (function(){
   geo.success = function(position){
     var lat_str = as_degrees( position.coords.latitude || 40.99167, "N", "S" )
     var lng_str = as_degrees( position.coords.longitude || -74.07944, "W", "E" )
-    $(".latlng").html( lat_str + " " + lng_str )
+    $(".latlng").html( lat_str + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + lng_str )
     geo.done()
   }
   
   geo.error = function(error){
-    $(".latlng").html( "+40&deg; 58' 90.9\" N 74&deg; 04' 46.3\" W" )
+    $(".latlng").html( "+40&deg; 58' 90.9\" N&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;74&deg; 04' 46.3\" W" )
     geo.done()
   }
   
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/CONTRIBUTING.md b/StoneIsland/plugins/cordova-plugin-splashscreen/CONTRIBUTING.md
index f7dbcaba..4c8e6a5e 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/CONTRIBUTING.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/CONTRIBUTING.md
@@ -27,7 +27,7 @@ There are multiple ways to contribute: report bugs, improve the docs, and
 contribute code.
 
 For instructions on this, start with the 
-[contribution overview](http://cordova.apache.org/#contribute).
+[contribution overview](http://cordova.apache.org/contribute/).
 
 The details are explained there, but the important items are:
  - Sign and submit an Apache ICLA (Contributor License Agreement).
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/LICENSE b/StoneIsland/plugins/cordova-plugin-splashscreen/LICENSE
index 7a4a3ea2..7a4a3ea2 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/LICENSE
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/LICENSE
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/NOTICE b/StoneIsland/plugins/cordova-plugin-splashscreen/NOTICE
index 8ec56a52..8ec56a52 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/NOTICE
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/NOTICE
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/README.md
index b43c2c59..ff790b16 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/README.md
@@ -19,14 +19,15 @@
 
 # cordova-plugin-splashscreen
 
-[![Build Status](https://travis-ci.org/apache/cordova-plugin-splashscreen.svg)](https://travis-ci.org/apache/cordova-plugin-splashscreen)
-
 This plugin displays and hides a splash screen during application launch.
 
-## Installation 
+:warning: Report issues on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20Splashscreen%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
+
+## Installation
 
     // npm hosted (new) id
     cordova plugin add cordova-plugin-splashscreen
+
     // you may also install directly from this repo
     cordova plugin add https://github.com/apache/cordova-plugin-splashscreen.git
 
@@ -41,18 +42,29 @@ This plugin displays and hides a splash screen during application launch.
 - Windows
 - Browser
 
+## Preferences
 
-## Methods
+#### config.xml
+
+-  __SplashScreen__ (string). The resource name which is used for the displaying splash screen. Different platforms use values for this.
+
+        <preference name="SplashScreen" value="resourcename" />
+
+-  __AutoHideSplashScreen__ (boolean, default to `true`). Indicates wherether hide splash screen automatically or not. Splash screen hidden after amount of time specified in the `SplashScreenDelay` preference.
+
+        <preference name="AutoHideSplashScreen" value="true" />
+
+-  __SplashScreenDelay__ (number, default to 3000). Amount of time in milliseconds to wait before automatically hide splash screen.
+
+        <preference name="SplashScreenDelay" value="3000" />
 
-- splashscreen.show
-- splashscreen.hide
 
 ### Android Quirks
 
 In your `config.xml`, you need to add the following preferences:
 
     <preference name="SplashScreen" value="foo" />
-    <preference name="SplashScreenDelay" value="10000" />
+    <preference name="SplashScreenDelay" value="3000" />
     <preference name="SplashMaintainAspectRatio" value="true|false" />
 
 Where foo is the name of the splashscreen file, preferably a 9 patch file. Make sure to add your splashcreen files to your res/xml directory under the appropriate folders. The second parameter represents how long the splashscreen will appear in milliseconds. It defaults to 3000 ms. See [Icons and Splash Screens](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html)
@@ -68,7 +80,7 @@ You can use the following preferences in your `config.xml`:
 
     <platform name="browser">
         <preference name="SplashScreen" value="images/browser/splashscreen.jpg" /> <!-- defaults to "img/logo.png" -->
-        <preference name="SplashScreenDelay" value="10000" /> <!-- defaults to "3000" -->
+        <preference name="SplashScreenDelay" value="3000" /> <!-- defaults to "3000" -->
         <preference name="SplashScreenBackgroundColor" value="green" /> <!-- defaults to "#464646" -->
         <preference name="ShowSplashScreen" value="false" /> <!-- defaults to "true" -->
         <preference name="SplashScreenWidth" value="600" /> <!-- defaults to "170" -->
@@ -84,16 +96,24 @@ You can use the following preferences in your `config.xml`:
 
         <preference name="FadeSplashScreen" value="false"/>
 
-- `FadeSplashScreenDuration` (float, defaults to `2`): Specifies the
-  number of seconds for the splash screen fade effect to execute.
+- `FadeSplashScreenDuration` (float, defaults to `3000`): Specifies the
+  number of milliseconds for the splash screen fade effect to execute.
+
+        <preference name="FadeSplashScreenDuration" value="3000"/>
+
+Note also that this value used to be seconds, and not milliseconds, so values less than 30 will still be treated as seconds. ( Consider this a deprecated patch that will disapear in some future version. )
 
-        <preference name="FadeSplashScreenDuration" value="4"/>
 
 - `ShowSplashScreenSpinner` (boolean, defaults to `true`): Set to `false`
   to hide the splash-screen spinner.
 
         <preference name="ShowSplashScreenSpinner" value="false"/>
 
+## Methods
+
+- splashscreen.show
+- splashscreen.hide
+
 ## splashscreen.hide
 
 Dismiss the splash screen.
@@ -128,4 +148,3 @@ event. See [Icons and Splash Screens](http://cordova.apache.org/docs/en/edge/con
 for more information on doing this configuration. For this reason, it is
 unlikely you need to call `navigator.splashscreen.show()` to make the splash
 screen visible for app startup.
-
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/RELEASENOTES.md b/StoneIsland/plugins/cordova-plugin-splashscreen/RELEASENOTES.md
index 2c6b0013..4f6ad612 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/RELEASENOTES.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/RELEASENOTES.md
@@ -20,43 +20,85 @@
 -->
 # Release Notes
 
-### 0.2.2 (Sept 25, 2013)
-* CB-4889 bumping&resetting version
-* CB-4889 renaming org.apache.cordova.core.splashscreen to org.apache.cordova.splashscreen
-* Rename CHANGELOG.md -> RELEASENOTES.md
-* [CB-4806] Update splashscreen image bounds for iOS 7
-* [CB-4752] Incremented plugin version on dev branch.
+### 3.0.0 (Nov 18, 2015)
+* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Updated `RELEASENOTES` to be newest to oldest
+* Fixing contribute link.
+* [CB-9750](https://issues.apache.org/jira/browse/CB-9750) `FadeSplashDuration` is now in `msecs`
+* [CB-8875](https://issues.apache.org/jira/browse/CB-8875) `FadeSplashScreen` was not fading
+* [CB-9467](https://issues.apache.org/jira/browse/CB-9467) SplashScreen does not show any image in hosted app on **Windows 10**
+* [CB-7282](https://issues.apache.org/jira/browse/CB-7282) Document `AutoHideSplashScreenpreference`
+* [CB-9327](https://issues.apache.org/jira/browse/CB-9327) - Splashscreen not receiving `CDVPageLoadNotification`
+* WP8: Avoid config `value` of a wrong element.
 
-### 0.2.3 (Oct 9, 2013)
-* [CB-4806] Re-fix Update splashscreen image bounds for iOS 7
-* [CB-4934] plugin-splashscreen should not show by default on Windows8
-* [CB-4929] plugin-splashscreen not loading proxy windows8
-* [CB-4915] Incremented plugin version on dev branch.
+### 2.1.0 (Jun 17, 2015)
+* added missing license headers
+* [CB-9128](https://issues.apache.org/jira/browse/CB-9128) cordova-plugin-splashscreen documentation translation: cordova-plugin-splashscreen
+* fix npm md issue
+* Fixed iOS unit tests.
+* [CB-3562](https://issues.apache.org/jira/browse/CB-3562): Disable screen rotation for iPhone when splash screen is shown. (closes #47)
+* [CB-8988](https://issues.apache.org/jira/browse/CB-8988): Fix rotation on iOS/iPad (closes #46)
+* [CB-8904](https://issues.apache.org/jira/browse/CB-8904): Don't reset the static variable when it's destroyed, otherwise we might as well just have a member variable
+* Removed wp7 from plugin.xml and package.json
+* [CB-8750](https://issues.apache.org/jira/browse/CB-8750) [wp8]: Rewrite resoultion helper
+* [CB-8750](https://issues.apache.org/jira/browse/CB-8750) [wp8]: Allow resolution-specific splashscreen images
+* [CB-8758](https://issues.apache.org/jira/browse/CB-8758) [wp8]: UnauthorizedAccessException on hide()
 
-### 0.2.4 (Oct 28, 2013)
-* CB-5128: add repo + issue tag to plugin.xml for splashscreen plugin
-* [CB-5010] Incremented plugin version on dev branch.
+### 2.0.0 (Apr 15, 2015)
+* give users a way to install the bleeding edge.
+* [CB-8746](https://issues.apache.org/jira/browse/CB-8746) gave plugin major version bump
+* [CB-8797](https://issues.apache.org/jira/browse/CB-8797) - Splashscreen preferences FadeSplashScreenDuration and FadeSplashScreen (iOS) are missing
+* [CB-8836](https://issues.apache.org/jira/browse/CB-8836) - Crashes after animating splashscreen
+* [CB-8753](https://issues.apache.org/jira/browse/CB-8753) android: Fix missing import in previous commit
+* [CB-8753](https://issues.apache.org/jira/browse/CB-8753) android: Adds `SplashMaintainAspectRatio` preference (close #43)
+* [CB-8683](https://issues.apache.org/jira/browse/CB-8683) changed plugin-id to pacakge-name
+* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) properly updated translated docs to use new id
+* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) updated translated docs to use new id
+* [CB-8345](https://issues.apache.org/jira/browse/CB-8345) Make default for splashscreen resource "screen" (which is what template and CLI assume it to be)
+* Revert "CB-8345 android: Make "splash" the default resource ID instead of null"
+* Use TRAVIS_BUILD_DIR, install paramedic by npm
+* [CB-8345](https://issues.apache.org/jira/browse/CB-8345) android: Make "splash" the default resource ID instead of null
+* docs: added Windows to supported platforms
+* [CB-7964](https://issues.apache.org/jira/browse/CB-7964) Add cordova-plugin-splashscreen support for browser platform
+* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) Updated Readme
+* [wp8] oops, Added back config parse result checks
+* [WP8] code cleanup, minor refactors, comments to clarify some stuff.
+* Extend WP8 Splash Screen to respect SplashScreen and SplashScreenDelay preferences from config file
+* [CB-8574](https://issues.apache.org/jira/browse/CB-8574) Integrate TravisCI
+* [CB-8438](https://issues.apache.org/jira/browse/CB-8438) cordova-plugin-splashscreen documentation translation: cordova-plugin-splashscreen
+* [CB-8538](https://issues.apache.org/jira/browse/CB-8538) Added package.json file
+* [CB-8397](https://issues.apache.org/jira/browse/CB-8397) Add support to 'windows' for showing the Windows Phone splashscreen
 
-### 0.2.5 (Dec 4, 2013)
-* add ubuntu platform
-* Added amazon-fireos platform. Change to use amazon-fireos as a platform if the user agent string contains 'cordova-amazon-fireos'
-* CB-5124 - Remove splashscreen config.xml values from iOS Configuration Docs, move to plugin docs
+### 1.0.0 (Feb 04, 2015)
+* [CB-8351](https://issues.apache.org/jira/browse/CB-8351) ios: Stop using deprecated IsIpad macro
+* [CB-3679](https://issues.apache.org/jira/browse/CB-3679) Add engine tag for Android >= 3.6.0 due to use of `preferences`
+* [CB-3679](https://issues.apache.org/jira/browse/CB-3679) Make SplashScreen plugin compatible with cordova-android@4.0.x
 
-### 0.2.6 (Jan 02, 2014)
-* CB-5658 Add doc/index.md for Splashscreen plugin
-* Handle error when splash image is missing.
+### 0.3.5 (Dec 02, 2014)
+* [CB-7204](https://issues.apache.org/jira/browse/CB-7204) - Race condition when hiding and showing spinner (closes #21)
+* [CB-7700](https://issues.apache.org/jira/browse/CB-7700) cordova-plugin-splashscreen documentation translation: cordova-plugin-splashscreen
 
-### 0.2.7 (Feb 05, 2014)
-* [CB-3562] Fix aspect ratio on landscape-only iPhone applications
-* CB-4051 fix for splashscreen rotation problem
+### 0.3.4 (Oct 03, 2014)
+* Finalized iOS splash screen (image name) tests. 176 tests in all, 44 for each type of device (iPad, iPhone, iPhone5, iPhone6, iPhone 6 Plus).
+* [CB-7633](https://issues.apache.org/jira/browse/CB-7633) - (Re-fix based on updated unit tests) iPhone 6 Plus support
+* Updated iOS tests for locked orientations
+* Added more iOS splash screen tests.
+* [CB-7633](https://issues.apache.org/jira/browse/CB-7633) - Add support for iPhone 6/6+
+* Added failing iPhone 6/6 Plus tests.
+* Added 'npm test'
+* [CB-7663](https://issues.apache.org/jira/browse/CB-7663) - iOS unit tests for splash screen
+* Properly formatted splashscreen preference docs.
 
-### 0.3.0 (Apr 17, 2014)
-* Add Tizen support to plugin
-* CB-6422: [windows8] use cordova/exec/proxy
-* CB-4051: [ios] - Re-fix - Splashscreen rotation problem (closes #13)
-* CB-6460: Update license headers
-* CB-6465: Add license headers to Tizen code
-* Add NOTICE file
+### 0.3.3 (Sep 17, 2014)
+* [CB-7249](https://issues.apache.org/jira/browse/CB-7249) cordova-plugin-splashscreen documentation translation
+* Renamed test dir, added nested plugin.xml
+* added documentation for manual tests
+* [CB-7196](https://issues.apache.org/jira/browse/CB-7196) port splashscreen tests to framework
+
+### 0.3.2 (Aug 06, 2014)
+* [CB-6127](https://issues.apache.org/jira/browse/CB-6127) Updated translations for docs
+* [CB-7041](https://issues.apache.org/jira/browse/CB-7041) ios: Fix image filename logic when setting the iPad splash screen
+* fixes Splashscreen crash on WP8
+* Remove outdated doc
 
 ### 0.3.1 (Jun 05, 2014)
 * documentation translation: cordova-plugin-splashscreen
@@ -64,80 +106,48 @@
 * Lisa testing pulling in plugins for plugin: cordova-plugin-splashscreen
 * Lisa testing pulling in plugins for plugin: cordova-plugin-splashscreen
 * Lisa testing pulling in plugins for plugin: cordova-plugin-splashscreen
-* CB-6810 Add license to CONTRIBUTING.md
+* [CB-6810](https://issues.apache.org/jira/browse/CB-6810) Add license to CONTRIBUTING.md
 * [wp8] updated quirk for  and combined iOS,WP8,BB10 quirks as they are all the same
 * [wp] implemented OnInit so splash screen can be shown before cordova page is loaded
 * [wp] plugin must be autoloaded for AutoHideSplashScreen preference to work
-* CB-6483 Use splash screen image from manifest on Windows8
-* CB-6491 add CONTRIBUTING.md
+* [CB-6483](https://issues.apache.org/jira/browse/CB-6483) Use splash screen image from manifest on Windows8
+* [CB-6491](https://issues.apache.org/jira/browse/CB-6491) add CONTRIBUTING.md
 * Revert "Merge branch 'tizen' of http://github.com/siovene/cordova-plugin-splashscreen"
 
-### 0.3.2 (Aug 06, 2014)
-* CB-6127 Updated translations for docs
-* CB-7041 ios: Fix image filename logic when setting the iPad splash screen
-* fixes Splashscreen crash on WP8
-* Remove outdated doc
+### 0.3.0 (Apr 17, 2014)
+* Add Tizen support to plugin
+* [CB-6422](https://issues.apache.org/jira/browse/CB-6422): [windows8] use cordova/exec/proxy
+* [CB-4051](https://issues.apache.org/jira/browse/CB-4051): [ios] - Re-fix - Splashscreen rotation problem (closes #13)
+* [CB-6460](https://issues.apache.org/jira/browse/CB-6460): Update license headers
+* [CB-6465](https://issues.apache.org/jira/browse/CB-6465): Add license headers to Tizen code
+* Add NOTICE file
 
-### 0.3.3 (Sep 17, 2014)
-* CB-7249 cordova-plugin-splashscreen documentation translation
-* Renamed test dir, added nested plugin.xml
-* added documentation for manual tests
-* CB-7196 port splashscreen tests to framework
+### 0.2.7 (Feb 05, 2014)
+* [CB-3562](https://issues.apache.org/jira/browse/CB-3562) Fix aspect ratio on landscape-only iPhone applications
+* [CB-4051](https://issues.apache.org/jira/browse/CB-4051) fix for splashscreen rotation problem
 
-### 0.3.4 (Oct 03, 2014)
-* Finalized iOS splash screen (image name) tests. 176 tests in all, 44 for each type of device (iPad, iPhone, iPhone5, iPhone6, iPhone 6 Plus).
-* CB-7633 - (Re-fix based on updated unit tests) iPhone 6 Plus support
-* Updated iOS tests for locked orientations
-* Added more iOS splash screen tests.
-* CB-7633 - Add support for iPhone 6/6+
-* Added failing iPhone 6/6 Plus tests.
-* Added 'npm test'
-* CB-7663 - iOS unit tests for splash screen
-* Properly formatted splashscreen preference docs.
+### 0.2.6 (Jan 02, 2014)
+* [CB-5658](https://issues.apache.org/jira/browse/CB-5658) Add doc/index.md for Splashscreen plugin
+* Handle error when splash image is missing.
 
-### 0.3.5 (Dec 02, 2014)
-* CB-7204 - Race condition when hiding and showing spinner (closes #21)
-* CB-7700 cordova-plugin-splashscreen documentation translation: cordova-plugin-splashscreen
+### 0.2.5 (Dec 4, 2013)
+* add ubuntu platform
+* Added amazon-fireos platform. Change to use amazon-fireos as a platform if the user agent string contains 'cordova-amazon-fireos'
+* [CB-5124](https://issues.apache.org/jira/browse/CB-5124) - Remove splashscreen config.xml values from iOS Configuration Docs, move to plugin docs
 
-### 1.0.0 (Feb 04, 2015)
-* CB-8351 ios: Stop using deprecated IsIpad macro
-* CB-3679 Add engine tag for Android >= 3.6.0 due to use of `preferences`
-* CB-3679 Make SplashScreen plugin compatible with cordova-android@4.0.x
+### 0.2.4 (Oct 28, 2013)
+* [CB-5128](https://issues.apache.org/jira/browse/CB-5128): add repo + issue tag to plugin.xml for splashscreen plugin
+* [CB-5010](https://issues.apache.org/jira/browse/CB-5010) Incremented plugin version on dev branch.
 
-### 2.0.0 (Apr 15, 2015)
-* give users a way to install the bleeding edge.
-* CB-8746 gave plugin major version bump
-* CB-8797 - Splashscreen preferences FadeSplashScreenDuration and FadeSplashScreen (iOS) are missing
-* CB-8836 - Crashes after animating splashscreen
-* CB-8753 android: Fix missing import in previous commit
-* CB-8753 android: Adds `SplashMaintainAspectRatio` preference (close #43)
-* CB-8683 changed plugin-id to pacakge-name
-* CB-8653 properly updated translated docs to use new id
-* CB-8653 updated translated docs to use new id
-* CB-8345 Make default for splashscreen resource "screen" (which is what template and CLI assume it to be)
-* Revert "CB-8345 android: Make "splash" the default resource ID instead of null"
-* Use TRAVIS_BUILD_DIR, install paramedic by npm
-* CB-8345 android: Make "splash" the default resource ID instead of null
-* docs: added Windows to supported platforms
-* CB-7964 Add cordova-plugin-splashscreen support for browser platform
-* CB-8653 Updated Readme
-* [wp8] oops, Added back config parse result checks
-* [WP8] code cleanup, minor refactors, comments to clarify some stuff.
-* Extend WP8 Splash Screen to respect SplashScreen and SplashScreenDelay preferences from config file
-* CB-8574 Integrate TravisCI
-* CB-8438 cordova-plugin-splashscreen documentation translation: cordova-plugin-splashscreen
-* CB-8538 Added package.json file
-* CB-8397 Add support to 'windows' for showing the Windows Phone splashscreen
+### 0.2.3 (Oct 9, 2013)
+* [CB-4806](https://issues.apache.org/jira/browse/CB-4806) Re-fix Update splashscreen image bounds for iOS 7
+* [CB-4934](https://issues.apache.org/jira/browse/CB-4934) plugin-splashscreen should not show by default on Windows8
+* [CB-4929](https://issues.apache.org/jira/browse/CB-4929) plugin-splashscreen not loading proxy windows8
+* [CB-4915](https://issues.apache.org/jira/browse/CB-4915) Incremented plugin version on dev branch.
 
-### 2.1.0 (Jun 17, 2015)
-* added missing license headers
-* CB-9128 cordova-plugin-splashscreen documentation translation: cordova-plugin-splashscreen
-* fix npm md issue
-* Fixed iOS unit tests.
-* CB-3562: Disable screen rotation for iPhone when splash screen is shown. (closes #47)
-* CB-8988: Fix rotation on iOS/iPad (closes #46)
-* CB-8904: Don't reset the static variable when it's destroyed, otherwise we might as well just have a member variable
-* Removed wp7 from plugin.xml and package.json
-* CB-8750 [wp8]: Rewrite resoultion helper
-* CB-8750 [wp8]: Allow resolution-specific splashscreen images
-* CB-8758 [wp8]: UnauthorizedAccessException on hide()
+### 0.2.2 (Sept 25, 2013)
+* [CB-4889](https://issues.apache.org/jira/browse/CB-4889) bumping&resetting version
+* [CB-4889](https://issues.apache.org/jira/browse/CB-4889) renaming org.apache.cordova.core.splashscreen to org.apache.cordova.splashscreen
+* Rename CHANGELOG.md -> RELEASENOTES.md
+* [CB-4806](https://issues.apache.org/jira/browse/CB-4806) Update splashscreen image bounds for iOS 7
+* [CB-4752](https://issues.apache.org/jira/browse/CB-4752) Incremented plugin version on dev branch.
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/README.md
index f876eff8..f876eff8 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/index.md
index b9fc40d2..b9fc40d2 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/de/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/README.md
index 1a94161a..1a94161a 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/index.md
index 3295c27f..3295c27f 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/es/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/README.md
index 65f58803..65f58803 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/index.md
index 6d2fd088..6d2fd088 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/fr/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/README.md
index 2a6c6ba4..2a6c6ba4 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/index.md
index 70435415..70435415 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/it/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/README.md
index a688b279..a688b279 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/index.md
index 24e72e5a..24e72e5a 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ja/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/README.md
index 5e10d207..5e10d207 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/index.md
index 6a0ea989..6a0ea989 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ko/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/README.md
index 0156be56..0156be56 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/index.md
index 33045cb7..33045cb7 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/pl/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ru/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ru/index.md
index 635c22d8..635c22d8 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ru/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/ru/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/README.md
index da37405b..da37405b 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/index.md b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/index.md
index efb309d0..efb309d0 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/index.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/doc/zh/index.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/package.json b/StoneIsland/plugins/cordova-plugin-splashscreen/package.json
index 447ac7e9..1c0a8403 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/package.json
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-splashscreen",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "description": "Cordova Splashscreen Plugin",
   "cordova": {
     "id": "cordova-plugin-splashscreen",
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/plugin.xml b/StoneIsland/plugins/cordova-plugin-splashscreen/plugin.xml
index e6370fa9..6477ad65 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/plugin.xml
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/plugin.xml
@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="cordova-plugin-splashscreen"
-      version="2.1.0">
+      version="3.0.0">
     <name>Splashscreen</name>
     <description>Cordova Splashscreen Plugin</description>
     <license>Apache 2.0</license>
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/android/SplashScreen.java b/StoneIsland/plugins/cordova-plugin-splashscreen/src/android/SplashScreen.java
index 75ad724c..75ad724c 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/android/SplashScreen.java
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/android/SplashScreen.java
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/blackberry10/index.js b/StoneIsland/plugins/cordova-plugin-splashscreen/src/blackberry10/index.js
index bd7e48c8..bd7e48c8 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/blackberry10/index.js
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/blackberry10/index.js
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/browser/SplashScreenProxy.js b/StoneIsland/plugins/cordova-plugin-splashscreen/src/browser/SplashScreenProxy.js
index d19f8c87..d19f8c87 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/browser/SplashScreenProxy.js
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/browser/SplashScreenProxy.js
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.h b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.h
index 0d6ae397..0d6ae397 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.h
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.h
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.m b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.m
index 43b356ad..a1add304 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.m
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVSplashScreen.m
@@ -22,14 +22,14 @@
 #import <Cordova/CDVScreenOrientationDelegate.h>
 #import "CDVViewController+SplashScreen.h"
 
-#define kSplashScreenDurationDefault 0.25f
+#define kSplashScreenDurationDefault 3000.0f
 
 
 @implementation CDVSplashScreen
 
 - (void)pluginInitialize
 {
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pageDidLoad) name:CDVPageDidLoadNotification object:self.webView];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pageDidLoad) name:CDVPageDidLoadNotification object:nil];
 
     [self setVisible:YES];
 }
@@ -82,11 +82,16 @@
     NSString* topActivityIndicator = [self.commandDelegate.settings objectForKey:[@"TopActivityIndicator" lowercaseString]];
     UIActivityIndicatorViewStyle topActivityIndicatorStyle = UIActivityIndicatorViewStyleGray;
 
-    if ([topActivityIndicator isEqualToString:@"whiteLarge"]) {
+    if ([topActivityIndicator isEqualToString:@"whiteLarge"])
+    {
         topActivityIndicatorStyle = UIActivityIndicatorViewStyleWhiteLarge;
-    } else if ([topActivityIndicator isEqualToString:@"white"]) {
+    }
+    else if ([topActivityIndicator isEqualToString:@"white"])
+    {
         topActivityIndicatorStyle = UIActivityIndicatorViewStyleWhite;
-    } else if ([topActivityIndicator isEqualToString:@"gray"]) {
+    }
+    else if ([topActivityIndicator isEqualToString:@"gray"])
+    {
         topActivityIndicatorStyle = UIActivityIndicatorViewStyleGray;
     }
 
@@ -104,7 +109,8 @@
 
     id showSplashScreenSpinnerValue = [self.commandDelegate.settings objectForKey:[@"ShowSplashScreenSpinner" lowercaseString]];
     // backwards compatibility - if key is missing, default to true
-    if ((showSplashScreenSpinnerValue == nil) || [showSplashScreenSpinnerValue boolValue]) {
+    if ((showSplashScreenSpinnerValue == nil) || [showSplashScreenSpinnerValue boolValue])
+    {
         [parentView addSubview:_activityView];
     }
 
@@ -116,6 +122,12 @@
     [self updateImage];
 }
 
+- (void)hideViews
+{
+    [_imageView setAlpha:0];
+    [_activityView setAlpha:0];
+}
+
 - (void)destroyViews
 {
     [(CDVViewController *)self.viewController setEnabledAutorotation:[(CDVViewController *)self.viewController shouldAutorotateDefaultValue]];
@@ -167,21 +179,33 @@
     // this means there are no mixed orientations in there
     BOOL isOrientationLocked = !(supportsPortrait && supportsLandscape);
     
-    if (imageName) {
+    if (imageName)
+    {
         imageName = [imageName stringByDeletingPathExtension];
-    } else {
+    }
+    else
+    {
         imageName = @"Default";
     }
     
-    if (device.iPhone5) { // does not support landscape
+    if (device.iPhone5)
+    { // does not support landscape
         imageName = [imageName stringByAppendingString:@"-568h"];
-    } else if (device.iPhone6) { // does not support landscape
+    }
+    else if (device.iPhone6)
+    { // does not support landscape
         imageName = [imageName stringByAppendingString:@"-667h"];
-    } else if (device.iPhone6Plus) { // supports landscape
-        if (isOrientationLocked) {
+    }
+    else if (device.iPhone6Plus)
+    { // supports landscape
+        if (isOrientationLocked)
+        {
             imageName = [imageName stringByAppendingString:(supportsLandscape ? @"-Landscape" : @"")];
-        } else {
-            switch (currentOrientation) {
+        }
+        else
+        {
+            switch (currentOrientation)
+            {
                 case UIInterfaceOrientationLandscapeLeft:
                 case UIInterfaceOrientationLandscapeRight:
                         imageName = [imageName stringByAppendingString:@"-Landscape"];
@@ -192,11 +216,17 @@
         }
         imageName = [imageName stringByAppendingString:@"-736h"];
 
-    } else if (device.iPad) { // supports landscape
-        if (isOrientationLocked) {
+    }
+    else if (device.iPad)
+    {   // supports landscape
+        if (isOrientationLocked)
+        {
             imageName = [imageName stringByAppendingString:(supportsLandscape ? @"-Landscape" : @"-Portrait")];
-        } else {
-            switch (currentOrientation) {
+        }
+        else
+        {
+            switch (currentOrientation)
+            {
                 case UIInterfaceOrientationLandscapeLeft:
                 case UIInterfaceOrientationLandscapeRight:
                     imageName = [imageName stringByAppendingString:@"-Landscape"];
@@ -219,16 +249,20 @@
 {
     NSString* imageName = [self getImageName:[[UIApplication sharedApplication] statusBarOrientation] delegate:(id<CDVScreenOrientationDelegate>)self.viewController device:[self getCurrentDevice]];
 
-    if (![imageName isEqualToString:_curImageName]) {
+    if (![imageName isEqualToString:_curImageName])
+    {
         UIImage* img = [UIImage imageNamed:imageName];
         _imageView.image = img;
         _curImageName = imageName;
     }
 
     // Check that splash screen's image exists before updating bounds
-    if (_imageView.image) {
+    if (_imageView.image)
+    {
         [self updateBounds];
-    } else {
+    }
+    else
+    {
         NSLog(@"WARNING: The splashscreen image named %@ was not found", imageName);
     }
 }
@@ -248,26 +282,34 @@
      * correctly.
      */
     BOOL isIPad = [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad;
-    if (UIInterfaceOrientationIsLandscape(orientation) && !isIPad) {
+    if (UIInterfaceOrientationIsLandscape(orientation) && !isIPad)
+    {
         imgTransform = CGAffineTransformMakeRotation(M_PI / 2);
         imgBounds.size = CGSizeMake(imgBounds.size.height, imgBounds.size.width);
     }
 
     // There's a special case when the image is the size of the screen.
-    if (CGSizeEqualToSize(screenSize, imgBounds.size)) {
+    if (CGSizeEqualToSize(screenSize, imgBounds.size))
+    {
         CGRect statusFrame = [self.viewController.view convertRect:[UIApplication sharedApplication].statusBarFrame fromView:nil];
-        if (!(IsAtLeastiOSVersion(@"7.0"))) {
+        if (!(IsAtLeastiOSVersion(@"7.0")))
+        {
             imgBounds.origin.y -= statusFrame.size.height;
         }
-    } else if (imgBounds.size.width > 0) {
+    }
+    else if (imgBounds.size.width > 0)
+    {
         CGRect viewBounds = self.viewController.view.bounds;
         CGFloat imgAspect = imgBounds.size.width / imgBounds.size.height;
         CGFloat viewAspect = viewBounds.size.width / viewBounds.size.height;
         // This matches the behaviour of the native splash screen.
         CGFloat ratio;
-        if (viewAspect > imgAspect) {
+        if (viewAspect > imgAspect)
+        {
             ratio = viewBounds.size.width / imgBounds.size.width;
-        } else {
+        }
+        else
+        {
             ratio = viewBounds.size.height / imgBounds.size.height;
         }
         imgBounds.size.height *= ratio;
@@ -280,50 +322,54 @@
 
 - (void)setVisible:(BOOL)visible
 {
-    if (visible == _visible) {
-        return;
-    }
-    _visible = visible;
+    if (visible != _visible)
+    {
+        _visible = visible;
 
-    id fadeSplashScreenValue = [self.commandDelegate.settings objectForKey:[@"FadeSplashScreen" lowercaseString]];
-    id fadeSplashScreenDuration = [self.commandDelegate.settings objectForKey:[@"FadeSplashScreenDuration" lowercaseString]];
+        id fadeSplashScreenValue = [self.commandDelegate.settings objectForKey:[@"FadeSplashScreen" lowercaseString]];
+        id fadeSplashScreenDuration = [self.commandDelegate.settings objectForKey:[@"FadeSplashScreenDuration" lowercaseString]];
 
-    float fadeDuration = fadeSplashScreenDuration == nil ? kSplashScreenDurationDefault : [fadeSplashScreenDuration floatValue];
+        float fadeDuration = fadeSplashScreenDuration == nil ? kSplashScreenDurationDefault : [fadeSplashScreenDuration floatValue];
 
-    if ((fadeSplashScreenValue == nil) || ![fadeSplashScreenValue boolValue]) {
-        fadeDuration = 0;
-    }
-
-    // Never animate the showing of the splash screen.
-    if (visible) {
-        if (_imageView == nil) {
-            [self createViews];
+        if ((fadeSplashScreenValue == nil) || ![fadeSplashScreenValue boolValue])
+        {
+            fadeDuration = 0;
+        }
+        else if(fadeDuration < 30)
+        {
+            // [CB-9750] This value used to be in decimal seconds, so we will assume that if someone specifies 10
+            // they mean 10 seconds, and not the meaningless 10ms
+            fadeDuration *= 1000;
+        }
+        
+        if (_visible)
+        {
+            if (_imageView == nil)
+            {
+                [self createViews];
+            }
+        }
+        else if (fadeDuration == 0)
+        {
+            [self destroyViews];
+        }
+        else
+        {
+            __weak __typeof(self) weakSelf = self;
+            [UIView transitionWithView:self.viewController.view
+                            duration:(fadeDuration / 1000)
+                            options:UIViewAnimationOptionTransitionNone
+                            animations:^(void) {
+                                [weakSelf hideViews];
+                            }
+                            completion:^(BOOL finished) {
+                                if (finished) {
+                                    [weakSelf destroyViews];
+                                    // TODO: It might also be nice to have a js event happen here -jm
+                                }
+                            }
+             ];
         }
-    } else if (fadeDuration == 0) {
-        [self destroyViews];
-    } else {
-      __weak __typeof(self) weakSelf = self;
-
-      [UIView transitionWithView:self.viewController.view
-                        duration:fadeDuration
-                         options:UIViewAnimationOptionTransitionNone
-                      animations:^(void) {
-                          __typeof(self) strongSelf = weakSelf;
-                          if (strongSelf != nil) {
-                              dispatch_async(dispatch_get_main_queue(), ^{
-                                      [strongSelf->_activityView setAlpha:0];
-                                      [strongSelf->_imageView setAlpha:0];
-                              });
-                          }
-                      }
-                      completion:^(BOOL finished) {
-                          if (finished) {
-                              dispatch_async(dispatch_get_main_queue(), ^{
-                                      [weakSelf destroyViews];
-                              });
-                          }
-                      }
-      ];      
     }
 }
 
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.h b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.h
index a948ea31..a948ea31 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.h
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.h
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.m b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.m
index 5736b6f2..5736b6f2 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.m
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ios/CDVViewController+SplashScreen.m
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/tizen/SplashScreenProxy.js b/StoneIsland/plugins/cordova-plugin-splashscreen/src/tizen/SplashScreenProxy.js
index fbd9f35f..fbd9f35f 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/tizen/SplashScreenProxy.js
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/tizen/SplashScreenProxy.js
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.cpp b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.cpp
index 1c9ecac8..1c9ecac8 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.cpp
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.cpp
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.h b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.h
index 1d437f84..1d437f84 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.h
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/ubuntu/splashscreen.h
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/ResolutionHelper.cs b/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/ResolutionHelper.cs
index 050c3927..050c3927 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/ResolutionHelper.cs
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/ResolutionHelper.cs
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/SplashScreen.cs b/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/SplashScreen.cs
index 680a8058..c56d4ad6 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/SplashScreen.cs
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/src/wp/SplashScreen.cs
@@ -105,6 +105,7 @@ namespace WPCordovaClassLib.Cordova.Commands
                     XDocument configFile = XDocument.Parse(sr.ReadToEnd());
 
                     string configAutoHide = configFile.Descendants()
+                                        .Where(x => x.Name.LocalName == "preference")
                                         .Where(x => (string)x.Attribute("name") == "AutoHideSplashScreen")
                                         .Select(x => (string)x.Attribute("value"))
                                         .FirstOrDefault();
@@ -113,6 +114,7 @@ namespace WPCordovaClassLib.Cordova.Commands
                     prefAutoHide = bool.TryParse(configAutoHide, out bVal) ? bVal : prefAutoHide;
 
                     string configDelay = configFile.Descendants()
+                                      .Where(x => x.Name.LocalName == "preference")
                                       .Where(x => (string)x.Attribute("name") == "SplashScreenDelay")
                                       .Select(x => (string)x.Attribute("value"))
                                       .FirstOrDefault();
@@ -120,6 +122,7 @@ namespace WPCordovaClassLib.Cordova.Commands
                     prefDelay = int.TryParse(configDelay, out nVal) ? nVal : prefDelay;
 
                     string configImage = configFile.Descendants()
+                                        .Where(x => x.Name.LocalName == "preference")
                                         .Where(x => (string)x.Attribute("name") == "SplashScreen")
                                         .Select(x => (string)x.Attribute("value"))
                                         .FirstOrDefault();
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/contents.xcworkspacedata b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/contents.xcworkspacedata
index 2dd325a0..2dd325a0 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/contents.xcworkspacedata
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/contents.xcworkspacedata
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout
index 7e4cdb93..7e4cdb93 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme
index 13f9a157..13f9a157 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/.npmignore b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/.npmignore
index c795b054..c795b054 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/.npmignore
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/.npmignore
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTest.m b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTest.m
index 1637d247..1637d247 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTest.m
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTest.m
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.h b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.h
index be4a7883..be4a7883 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.h
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.h
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.m b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.m
index b5a1b23e..b5a1b23e 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.m
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/ImageNameTestDelegates.m
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/Info.plist b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/Info.plist
index 95c8addb..95c8addb 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/Info.plist
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenLibTests/Info.plist
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.pbxproj b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.pbxproj
index ce820d81..ce820d81 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.pbxproj
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.pbxproj
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 8f912784..8f912784 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout
index 7e4cdb93..7e4cdb93 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/project.xcworkspace/xcshareddata/CDVSplashScreenTest.xccheckout
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLib.xcscheme b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLib.xcscheme
index b97b8633..b97b8633 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLib.xcscheme
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLib.xcscheme
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLibTests.xcscheme b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLibTests.xcscheme
index 6a2a5261..6a2a5261 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLibTests.xcscheme
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/CDVSplashScreenTest/CDVSplashScreenTest.xcodeproj/xcshareddata/xcschemes/CDVSplashScreenLibTests.xcscheme
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/README.md
index 97ee9dff..97ee9dff 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/de/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/de/README.md
index 9c7f0a4f..9c7f0a4f 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/de/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/de/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/es/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/es/README.md
index 2176c921..2176c921 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/es/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/es/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/fr/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/fr/README.md
index 0dbbd0d2..0dbbd0d2 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/fr/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/fr/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/it/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/it/README.md
index 2a42df67..2a42df67 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/it/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/it/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ja/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ja/README.md
index 011b8242..011b8242 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ja/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ja/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ko/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ko/README.md
index 6981207a..6981207a 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ko/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/ko/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/pl/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/pl/README.md
index f13828fe..f13828fe 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/pl/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/pl/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/zh/README.md b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/zh/README.md
index 3a04bcd1..3a04bcd1 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/zh/README.md
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/doc/zh/README.md
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/package.json b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/package.json
index d8b23857..d8b23857 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/package.json
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/ios/package.json
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/plugin.xml b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/plugin.xml
index bf9cb0ac..36652d98 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/plugin.xml
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/plugin.xml
@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="cordova-plugin-splashscreen-tests"
-    version="2.1.0">
+    version="3.0.0">
     <name>Cordova Splashscreen Plugin Tests</name>
     <license>Apache 2.0</license>
 
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/tests.js b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/tests.js
index 8c4d22b4..8c4d22b4 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/tests/tests.js
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/tests/tests.js
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/www/splashscreen.js b/StoneIsland/plugins/cordova-plugin-splashscreen/www/splashscreen.js
index 7cb48bdd..7cb48bdd 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/www/splashscreen.js
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/www/splashscreen.js
diff --git a/StoneIsland/plugins/cordova-plugin-splashscreen/www/windows/SplashScreenProxy.js b/StoneIsland/plugins/cordova-plugin-splashscreen/www/windows/SplashScreenProxy.js
index dab72381..271a14ca 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-splashscreen/www/windows/SplashScreenProxy.js
+++ b/StoneIsland/plugins/cordova-plugin-splashscreen/www/windows/SplashScreenProxy.js
@@ -26,9 +26,11 @@ var cordova = require('cordova'),
     channel = require('cordova/channel');
 
 var isPhone = (cordova.platformId == "windows") && WinJS.Utilities.isPhone;
-var localSplash = null; 
+var isHosted = window.location.protocol.indexOf('http') === 0;
+var localSplash = null;
 var bgColor = "#464646"; // default backgrond color; TDOO - read it from .appxmanifest
-var splashImageSrc = isPhone ? "ms-appx:///images/splashscreenphone.png" : "ms-appx:///images/splashscreen.png";
+var splashImageSrc = (isHosted ? "ms-appx-web" : "ms-appx") + ":///images/"
+    + (isPhone ? "splashscreenphone.png" : "splashscreen.png");
 
 var SplashScreen = {
     setBGColor: function (cssBGColor) {
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index b9dd0a91..2a588826 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -103,7 +103,7 @@
     <div class="story">STORY</div>
     <div class="archive">ARCHIVE</div>
     <div class="alert"></div>
-    <span class="latlng">+40&deg; 58' 90" -74&deg; 04' 46"</span>
+    <span class="latlng">+40&deg; 58' 90.9" N&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;74&deg; 04' 46.3" W</span>
   </div>
 
   <div id="header">
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 73af443a..0770b0f6 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -79,8 +79,6 @@ var app = (function(){
     push.init()
     app.account.connect( app.router.launch.bind(app.router) )
 //     }
-    
-    $("body").removeClass("loading")
   }
   
   var refresh_time = +Date.now()
diff --git a/StoneIsland/www/js/lib/_router.js b/StoneIsland/www/js/lib/_router.js
index b1fa1c97..6ec14825 100755
--- a/StoneIsland/www/js/lib/_router.js
+++ b/StoneIsland/www/js/lib/_router.js
@@ -58,6 +58,11 @@ var SiteRouter = Router.extend({
       this.route()
 	  }
 	  this.initial_route = null
+    
+    if (window.cordova) {
+      navigator.splashscreen.hide()
+    }
+    $("body").removeClass("loading")
 	},
 
   go: function(url){
diff --git a/StoneIsland/www/js/lib/etc/geo.js b/StoneIsland/www/js/lib/etc/geo.js
index 88521bb1..5af9ecfd 100755
--- a/StoneIsland/www/js/lib/etc/geo.js
+++ b/StoneIsland/www/js/lib/etc/geo.js
@@ -11,12 +11,12 @@ var geo = (function(){
   geo.success = function(position){
     var lat_str = as_degrees( position.coords.latitude || 40.99167, "N", "S" )
     var lng_str = as_degrees( position.coords.longitude || -74.07944, "W", "E" )
-    $(".latlng").html( lat_str + " " + lng_str )
+    $(".latlng").html( lat_str + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + lng_str )
     geo.done()
   }
   
   geo.error = function(error){
-    $(".latlng").html( "+40&deg; 58' 90.9\" N 74&deg; 04' 46.3\" W" )
+    $(".latlng").html( "+40&deg; 58' 90.9\" N&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;74&deg; 04' 46.3\" W" )
     geo.done()
   }