cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgreb...@apache.org
Subject cordova-plugin-splashscreen git commit: CB-8397 Add support to 'windows' for showing the Windows Phone splashscreen
Date Wed, 11 Feb 2015 10:36:57 GMT
Repository: cordova-plugin-splashscreen
Updated Branches:
  refs/heads/master b232cd744 -> bcbc23958


CB-8397 Add support to 'windows' for showing the Windows Phone splashscreen


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/bcbc2395
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/bcbc2395
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/bcbc2395

Branch: refs/heads/master
Commit: bcbc23958fcd294940ad81c2c8409bca8dd92d8d
Parents: b232cd7
Author: sgrebnov <v-segreb@microsoft.com>
Authored: Fri Feb 6 18:15:08 2015 +0300
Committer: sgrebnov <v-segreb@microsoft.com>
Committed: Wed Feb 11 13:36:02 2015 +0300

----------------------------------------------------------------------
 plugin.xml                        |   9 ++-
 www/windows/SplashScreenProxy.js  |  77 ++++++++++++++++++++++++
 www/windows8/SplashScreenProxy.js | 106 ---------------------------------
 3 files changed, 85 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/bcbc2395/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 686e797..d13e456 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -116,7 +116,14 @@
 
     <!-- windows8 -->
     <platform name="windows8">
-        <js-module src="www/windows8/SplashScreenProxy.js" name="SplashScreenProxy">
+        <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
+            <merges target="" />
+        </js-module>
+    </platform>
+
+    <!-- windows -->
+    <platform name="windows">
+        <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
             <merges target="" />
         </js-module>
     </platform>

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/bcbc2395/www/windows/SplashScreenProxy.js
----------------------------------------------------------------------
diff --git a/www/windows/SplashScreenProxy.js b/www/windows/SplashScreenProxy.js
new file mode 100644
index 0000000..dab7238
--- /dev/null
+++ b/www/windows/SplashScreenProxy.js
@@ -0,0 +1,77 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+/*jslint sloppy:true */
+/*global Windows:true, require, module, window, document, WinJS */
+
+var cordova = require('cordova'),
+    channel = require('cordova/channel');
+
+var isPhone = (cordova.platformId == "windows") && WinJS.Utilities.isPhone;
+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 SplashScreen = {
+    setBGColor: function (cssBGColor) {
+        bgColor = cssBGColor;
+        if (localSplash) {
+            localSplash.style.backgroundColor = bgColor;
+        }
+    },
+    show: function () {
+        if (localSplash) {
+            return; // already showed
+        }
+
+        localSplash = document.createElement("div");
+        localSplash.style.backgroundColor = bgColor;
+        localSplash.style.position = "fixed";
+        localSplash.style.top = "0";
+        localSplash.style.width = "100%";
+        localSplash.style.height = "100%";
+
+        localSplashImage = document.createElement("img");
+        localSplashImage.src = splashImageSrc;
+        localSplashImage.style.maxWidth = "100%";
+        localSplashImage.style.maxHeight = "100%";
+        // center horizontally
+        localSplashImage.style.margin = "0 auto";
+        localSplashImage.style.display = "block";
+        // center vertically
+        localSplashImage.style.position = "relative";
+        localSplashImage.style.top = "50%";
+        localSplashImage.style.transform = "translateY(-50%)";
+
+        localSplash.appendChild(localSplashImage);
+        document.body.appendChild(localSplash);
+    },
+    hide: function () {
+        if (localSplash) {
+            document.body.removeChild(localSplash);
+            localSplash = null;
+        }
+    }
+};
+
+module.exports = SplashScreen;
+
+require("cordova/exec/proxy").add("SplashScreen", SplashScreen);

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/bcbc2395/www/windows8/SplashScreenProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/SplashScreenProxy.js b/www/windows8/SplashScreenProxy.js
deleted file mode 100644
index 42068dd..0000000
--- a/www/windows8/SplashScreenProxy.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-/*jslint sloppy:true */
-/*global Windows:true, require, module, window, document, WinJS */
-
-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";
-
-
-
-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 = "ms-appx:///images/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;
-
-function activated(evt) {
-    if (evt.detail.kind === Windows.ApplicationModel.Activation.ActivationKind.launch) {
-        splash = evt.detail.splashScreen;
-        position = evt.detail.splashScreen.imageLocation;
-    }
-}
-
-
-
-
-channel.onCordovaReady.subscribe(function (evt) {
-    document.addEventListener("DOMContentLoaded", function (evt) {
-        WinJS.Application.addEventListener("activated", activated, false);
-    }, false);
-});
-
-require("cordova/exec/proxy").add("SplashScreen", SplashScreen);
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message