diff --git a/RELEASENOTES.md b/RELEASENOTES.md index d5950f2..85e9b6e 100644 --- a/RELEASENOTES.md +++ b/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. \ No newline at end of file diff --git a/plugin.xml b/plugin.xml index 8678830..245720e 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="0.2.3"> Splashscreen Cordova Splashscreen Plugin Apache 2.0 diff --git a/src/ios/CDVSplashScreen.m b/src/ios/CDVSplashScreen.m index 8159ce1..a1c11c3 100644 --- a/src/ios/CDVSplashScreen.m +++ b/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; } diff --git a/www/windows8/SplashScreenProxy.js b/www/windows8/SplashScreenProxy.js index aa592c1..e7b2f30 100644 --- a/www/windows8/SplashScreenProxy.js +++ b/www/windows8/SplashScreenProxy.js @@ -19,75 +19,77 @@ * */ -/*global Windows:true */ +/*jslint sloppy:true */ +/*global Windows:true, require, module, window, document, WinJS */ - var cordova = require('cordova'), - channel = require('cordova/channel'); +var cordova = require('cordova'), + channel = require('cordova/channel'); /* This is the actual implementation part that returns the result on Windows 8 */ - var position = { x: 0, y: 0, width: 0, height: 0 }; // defined by evt.detail.splashScreen.imageLocation - var splash = null; // - var localSplash; // the image to display - var localSplashImage; - var bgColor = "#464646"; +var position = { x: 0, y: 0, width: 0, height: 0 }; // defined by evt.detail.splashScreen.imageLocation +var splash = null; // +var localSplash; // the image to display +var localSplashImage; +var bgColor = "#464646"; - function onResize(evt) { - if (splash) { - position = splash.imageLocation; - updateImageLocation(); + + +function updateImageLocation() { + localSplash.style.width = window.innerWidth + "px"; + localSplash.style.height = window.innerHeight + "px"; + localSplash.style.top = "0px"; + localSplash.style.left = "0px"; + + localSplashImage.style.top = position.y + "px"; + localSplashImage.style.left = position.x + "px"; + localSplashImage.style.height = position.height + "px"; + localSplashImage.style.width = position.width + "px"; +} + +function onResize(evt) { + if (splash) { + position = splash.imageLocation; + updateImageLocation(); + } +} + +var SplashScreen = { + setBGColor: function (cssBGColor) { + bgColor = cssBGColor; + if (localSplash) { + localSplash.style.backgroundColor = bgColor; } + }, + show: function () { + window.addEventListener("resize", onResize, false); + localSplash = document.createElement("div"); + localSplash.style.backgroundColor = bgColor; + localSplash.style.position = "absolute"; + + localSplashImage = document.createElement("img"); + localSplashImage.src = "img/splashscreen.png"; + localSplashImage.style.position = "absolute"; + + updateImageLocation(); + + localSplash.appendChild(localSplashImage); + document.body.appendChild(localSplash); + }, + hide: function () { + window.removeEventListener("resize", onResize, false); + document.body.removeChild(localSplash); + localSplash = null; } +}; - function updateImageLocation() { - localSplash.style.width = window.innerWidth + "px"; - localSplash.style.height = window.innerHeight + "px"; - localSplash.style.top = "0px"; - localSplash.style.left = "0px"; - - localSplashImage.style.top = position.y + "px"; - localSplashImage.style.left = position.x + "px"; - localSplashImage.style.height = position.height + "px"; - localSplashImage.style.width = position.width + "px"; - } - - var SplashScreen = { - setBGColor:function(cssBGColor) { - bgColor = cssBGColor; - if (localSplash) { - localSplash.style.backgroundColor = bgColor; - } - }, - show:function(){ - window.addEventListener("resize", onResize, false); - localSplash = document.createElement("div"); - localSplash.style.backgroundColor = bgColor;; - localSplash.style.position = "absolute"; - - var img = localSplashImage = document.createElement("img"); - img.src = "img/splashscreen.png"; - img.style.position = "absolute"; - - updateImageLocation(); - - localSplash.appendChild(localSplashImage); - document.body.appendChild(localSplash); - }, - hide:function(){ - window.removeEventListener("resize", onResize, false); - document.body.removeChild(localSplash); - localSplash = null; - } - } - - module.exports = SplashScreen; +module.exports = SplashScreen; 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);