Merge branch 'dev'

RELEASENOTES.md

@@ -26,3 +26,9 @@
 * Rename CHANGELOG.md -> RELEASENOTES.md
 * [CB-4806] Update splashscreen image bounds for iOS 7
 * [CB-4752] Incremented plugin version on dev branch.
+
+### 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.

plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.splashscreen"
-      version="0.2.2">
+      version="0.2.3">
     <name>Splashscreen</name>
     <description>Cordova Splashscreen Plugin</description>
     <license>Apache 2.0</license>

src/ios/CDVSplashScreen.m

@@ -170,7 +170,6 @@
     // There's a special case when the image is the size of the screen.
     if (CGSizeEqualToSize(screenSize, imgBounds.size)) {
         CGRect statusFrame = [self.viewController.view convertRect:[UIApplication sharedApplication].statusBarFrame fromView:nil];
-        imgBounds.origin.y -= statusFrame.size.height;
         if (!(IsAtLeastiOSVersion(@"7.0"))) {
             imgBounds.origin.y -= statusFrame.size.height;
         }        

www/windows8/SplashScreenProxy.js

@@ -19,7 +19,8 @@
  *
 */
 
-/*global Windows:true */
+/*jslint sloppy:true */
+/*global Windows:true, require, module, window, document, WinJS */
 
 var cordova = require('cordova'),
     channel = require('cordova/channel');
@@ -33,12 +34,7 @@
 var localSplashImage;
 var bgColor = "#464646";
 
-    function onResize(evt) {
-        if (splash) {
-            position = splash.imageLocation;
-            updateImageLocation();
-        }
-    }
+
 
 function updateImageLocation() {
     localSplash.style.width = window.innerWidth + "px";
@@ -52,6 +48,13 @@
     localSplashImage.style.width = position.width + "px";
 }
 
+function onResize(evt) {
+    if (splash) {
+        position = splash.imageLocation;
+        updateImageLocation();
+    }
+}
+
 var SplashScreen = {
     setBGColor: function (cssBGColor) {
         bgColor = cssBGColor;
@@ -62,12 +65,12 @@
     show: function () {
         window.addEventListener("resize", onResize, false);
         localSplash = document.createElement("div");
-            localSplash.style.backgroundColor = bgColor;;
+        localSplash.style.backgroundColor = bgColor;
         localSplash.style.position = "absolute";
 
-            var img = localSplashImage = document.createElement("img");
-            img.src = "img/splashscreen.png";
-            img.style.position = "absolute";
+        localSplashImage = document.createElement("img");
+        localSplashImage.src = "img/splashscreen.png";
+        localSplashImage.style.position = "absolute";
 
         updateImageLocation();
 
@@ -79,7 +82,7 @@
         document.body.removeChild(localSplash);
         localSplash = null;
     }
-    }
+};
 
 module.exports = SplashScreen;
 
@@ -87,7 +90,6 @@ function activated(evt) {
     if (evt.detail.kind === Windows.ApplicationModel.Activation.ActivationKind.launch) {
         splash = evt.detail.splashScreen;
         position = evt.detail.splashScreen.imageLocation;
-        SplashScreen.show();
     }
 }
 
@@ -100,5 +102,5 @@ channel.onCordovaReady.subscribe(function (evt) {
     }, false);
 });
 
-require("cordova/commandProxy").add("SplashScreen",SplashScreen);
+require("cordova/windows8/commandProxy").add("SplashScreen", SplashScreen);