You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/10/10 19:56:50 UTC

[1/7] git commit: [CB-4915] Incremented plugin version on dev branch.

Updated Branches:
  refs/heads/master 10e7e9a1d -> b0543eee7


[CB-4915] Incremented plugin version on dev branch.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/52b6c539
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/52b6c539
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/52b6c539

Branch: refs/heads/master
Commit: 52b6c539d3145aa47eab803217e79154c8430fc5
Parents: f1aed7d
Author: Steven Gill <st...@gmail.com>
Authored: Wed Sep 25 18:34:15 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Sep 25 18:34:15 2013 -0700

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/52b6c539/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 8678830..cf3ae76 100644
--- a/plugin.xml
+++ b/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-dev">
     <name>Splashscreen</name>
     <description>Cordova Splashscreen Plugin</description>
     <license>Apache 2.0</license>


[2/7] git commit: [CB-4929] plugin-splashscreen not loading proxy windows8

Posted by st...@apache.org.
[CB-4929] plugin-splashscreen not loading proxy windows8


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/71a8c9cc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/71a8c9cc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/71a8c9cc

Branch: refs/heads/master
Commit: 71a8c9cc33e54ceb9cbaadd642717b9c297d7242
Parents: f1aed7d
Author: Carlos Santana <cs...@gmail.com>
Authored: Thu Sep 26 15:20:22 2013 -0400
Committer: Carlos Santana <cs...@gmail.com>
Committed: Thu Sep 26 15:20:22 2013 -0400

----------------------------------------------------------------------
 www/windows8/SplashScreenProxy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/71a8c9cc/www/windows8/SplashScreenProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/SplashScreenProxy.js b/www/windows8/SplashScreenProxy.js
index aa592c1..0652dcb 100644
--- a/www/windows8/SplashScreenProxy.js
+++ b/www/windows8/SplashScreenProxy.js
@@ -28,7 +28,7 @@
 */
 
     var position = { x: 0, y: 0, width: 0, height: 0 };  // defined by evt.detail.splashScreen.imageLocation
-    var splash = null; // 
+    var splash = null; //
     var localSplash; // the image to display
     var localSplashImage;
     var bgColor = "#464646";
@@ -100,5 +100,5 @@ channel.onCordovaReady.subscribe(function (evt) {
     }, false);
 });
 
-require("cordova/commandProxy").add("SplashScreen",SplashScreen);
+require("cordova/windows8/commandProxy").add("SplashScreen",SplashScreen);
 


[7/7] git commit: Merge branch 'dev'

Posted by st...@apache.org.
Merge branch 'dev'


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/b0543eee
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/b0543eee
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/b0543eee

Branch: refs/heads/master
Commit: b0543eee776a9e561602eea8c95973a4b3ae464d
Parents: 10e7e9a 0b733d1
Author: Steven Gill <st...@gmail.com>
Authored: Wed Oct 9 15:44:00 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Oct 9 15:44:00 2013 -0700

----------------------------------------------------------------------
 RELEASENOTES.md                   |   6 ++
 plugin.xml                        |   2 +-
 src/ios/CDVSplashScreen.m         |   1 -
 www/windows8/SplashScreenProxy.js | 106 +++++++++++++++++----------------
 4 files changed, 61 insertions(+), 54 deletions(-)
----------------------------------------------------------------------



[4/7] git commit: Merge branch 'CB-4934' of https://github.com/csantanapr/cordova-plugin-splashscreen into dev

Posted by st...@apache.org.
Merge branch 'CB-4934' of https://github.com/csantanapr/cordova-plugin-splashscreen into dev


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/abc62a5e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/abc62a5e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/abc62a5e

Branch: refs/heads/master
Commit: abc62a5edac1d378322065106a662dba9d2ba1a6
Parents: 52b6c53 2dc0f42
Author: purplecabbage <pu...@gmail.com>
Authored: Thu Sep 26 16:14:11 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Thu Sep 26 16:14:11 2013 -0700

----------------------------------------------------------------------
 www/windows8/SplashScreenProxy.js | 106 +++++++++++++++++----------------
 1 file changed, 54 insertions(+), 52 deletions(-)
----------------------------------------------------------------------



[6/7] git commit: [CB-5010] Updated version and RELEASENOTES.md for release 0.2.3

Posted by st...@apache.org.
[CB-5010] Updated version and RELEASENOTES.md for release 0.2.3


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/0b733d17
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/0b733d17
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/0b733d17

Branch: refs/heads/master
Commit: 0b733d179739b9c6f81d583cc9d4962d8bc0eb98
Parents: c2dea2f
Author: Steven Gill <st...@gmail.com>
Authored: Wed Oct 9 15:33:12 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Oct 9 15:33:12 2013 -0700

----------------------------------------------------------------------
 RELEASENOTES.md | 6 ++++++
 plugin.xml      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/0b733d17/RELEASENOTES.md
----------------------------------------------------------------------
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

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/0b733d17/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index cf3ae76..245720e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.splashscreen"
-      version="0.2.3-dev">
+      version="0.2.3">
     <name>Splashscreen</name>
     <description>Cordova Splashscreen Plugin</description>
     <license>Apache 2.0</license>


[5/7] git commit: [CB-4806] (Re-fix) Update splashscreen image bounds for iOS 7

Posted by st...@apache.org.
[CB-4806] (Re-fix) Update splashscreen image bounds for iOS 7


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/c2dea2fc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/c2dea2fc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/c2dea2fc

Branch: refs/heads/master
Commit: c2dea2fc02beb71c154eff6fbe80c3c3729e2f74
Parents: abc62a5
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Oct 1 13:26:05 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Oct 1 13:26:05 2013 -0700

----------------------------------------------------------------------
 src/ios/CDVSplashScreen.m | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/c2dea2fc/src/ios/CDVSplashScreen.m
----------------------------------------------------------------------
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;
         }        


[3/7] git commit: [CB-4934] plugin-splashscreen should not show by default on Windows8

Posted by st...@apache.org.
[CB-4934] plugin-splashscreen should not show by default on Windows8


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/2dc0f42b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/2dc0f42b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/2dc0f42b

Branch: refs/heads/master
Commit: 2dc0f42b8f7779ba0cac5778a879aaf0162bf579
Parents: 71a8c9c
Author: Carlos Santana <cs...@gmail.com>
Authored: Thu Sep 26 17:54:43 2013 -0400
Committer: Carlos Santana <cs...@gmail.com>
Committed: Thu Sep 26 17:54:43 2013 -0400

----------------------------------------------------------------------
 www/windows8/SplashScreenProxy.js | 106 +++++++++++++++++----------------
 1 file changed, 54 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/2dc0f42b/www/windows8/SplashScreenProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/SplashScreenProxy.js b/www/windows8/SplashScreenProxy.js
index 0652dcb..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";
+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";
+    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";
-
-            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;
+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;
     }
+};
 
-    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/windows8/commandProxy").add("SplashScreen",SplashScreen);
+require("cordova/windows8/commandProxy").add("SplashScreen", SplashScreen);