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 2015/03/31 19:58:25 UTC

[1/7] cordova-plugin-splashscreen git commit: CB-7964 Add cordova-plugin-splashscreen support for browser platform

Repository: cordova-plugin-splashscreen
Updated Branches:
  refs/heads/old-ID 6ce8a3286 -> 43e9c7534


CB-7964 Add cordova-plugin-splashscreen support for browser platform

Added Browser platform support
Using cordova/confighelper module to read parameter values from config.xml
Updated the docs


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

Branch: refs/heads/old-ID
Commit: bb65993a5181600af130c17a0e0ac2c3f2115406
Parents: 6ce8a32
Author: daserge <da...@yandex.ru>
Authored: Thu Jan 15 14:06:38 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Wed Mar 18 16:01:31 2015 +0300

----------------------------------------------------------------------
 README.md                        |  16 +++-
 plugin.xml                       |   7 ++
 src/browser/SplashScreenProxy.js | 138 ++++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/bb65993a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 3d58746..d8496ff 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ This plugin displays and hides a splash screen during application launch.
 - iOS
 - Windows Phone 7 and 8
 - Windows 8
+- Browser
 
 
 ## Methods
@@ -45,7 +46,7 @@ This plugin displays and hides a splash screen during application launch.
 
 ### Android Quirks
 
-In your config.xml, you need to add the following preferences:
+In your `config.xml`, you need to add the following preferences:
 
     <preference name="SplashScreen" value="foo" />
     <preference name="SplashScreenDelay" value="10000" />
@@ -53,6 +54,19 @@ In your config.xml, you need to add the following preferences:
 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)
 for more information.
 
+### Browser Quirks
+
+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="SplashScreenBackgroundColor" value="green" /> <!-- defaults to "#464646" -->
+        <preference name="ShowSplashScreen" value="false" /> <!-- defaults to "true" -->
+        <preference name="SplashScreenWidth" value="600" /> <!-- defaults to "170" -->
+        <preference name="SplashScreenHeight" value="300" /> <!-- defaults to "200" -->
+    </platform>
+
 ## splashscreen.hide
 
 Dismiss the splash screen.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/bb65993a/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index d13e456..aae8664 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -134,4 +134,11 @@
             <runs />
         </js-module>
     </platform>
+
+    <!-- browser -->
+    <platform name="browser">
+        <js-module src="src/browser/SplashScreenProxy.js" name="SplashScreenProxy">
+            <runs />
+        </js-module>
+    </platform>
 </plugin>

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/bb65993a/src/browser/SplashScreenProxy.js
----------------------------------------------------------------------
diff --git a/src/browser/SplashScreenProxy.js b/src/browser/SplashScreenProxy.js
new file mode 100644
index 0000000..d19f8c8
--- /dev/null
+++ b/src/browser/SplashScreenProxy.js
@@ -0,0 +1,138 @@
+/*
+ *
+ * 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.
+ *
+*/
+// Default parameter values including image size can be changed in `config.xml`
+var splashImageWidth = 170;
+var splashImageHeight = 200;
+var position = { x: 0, y: 0, width: splashImageWidth, height: splashImageHeight }; 
+var splash = null; //
+var localSplash; // the image to display
+var localSplashImage;
+var bgColor = "#464646";
+var imageSrc = 'img/logo.png';
+var splashScreenDelay = 3000; // in milliseconds
+var showSplashScreen = true; // show splashcreen by default
+var configHelper = cordova.require('cordova/confighelper');
+
+function updateImageLocation() {
+    position.width = Math.min(splashImageWidth, window.innerWidth);
+    position.height = position.width * (splashImageHeight / splashImageWidth);
+
+    localSplash.style.width = window.innerWidth + "px";
+    localSplash.style.height = window.innerHeight + "px";
+    localSplash.style.top = "0px";
+    localSplash.style.left = "0px";
+
+    localSplashImage.style.top = "50%";
+    localSplashImage.style.left = "50%";
+    localSplashImage.style.height = position.height + "px";
+    localSplashImage.style.width = position.width + "px";
+    localSplashImage.style.marginTop = (-position.height / 2) + "px";
+    localSplashImage.style.marginLeft = (-position.width / 2) + "px";
+}
+
+function onResize() {
+    updateImageLocation();
+}
+
+var SplashScreen = {
+    setBGColor: function (cssBGColor) {
+        bgColor = cssBGColor;
+        if (localSplash) {
+            localSplash.style.backgroundColor = bgColor;
+        }
+    },
+    show: function () {
+        if(!localSplash) {
+            window.addEventListener("resize", onResize, false);
+            localSplash = document.createElement("div");
+            localSplash.style.backgroundColor = bgColor;
+            localSplash.style.position = "absolute";
+
+            localSplashImage = document.createElement("img");
+            localSplashImage.src = imageSrc;
+            localSplashImage.style.position = "absolute";
+
+            updateImageLocation();
+
+            localSplash.appendChild(localSplashImage);
+            document.body.appendChild(localSplash);
+        }
+    },
+    hide: function () {
+        if(localSplash) {
+            window.removeEventListener("resize", onResize, false);
+            document.body.removeChild(localSplash);
+            localSplash = null;
+        }
+    }
+};
+
+/**
+ * Reads preferences via ConfigHelper and substitutes default parameters.
+ */
+function readPreferencesFromCfg(cfg) {
+    try {
+        var value = cfg.getPreferenceValue('ShowSplashScreen');
+        if(typeof value != 'undefined') {
+            showSplashScreen = value === 'true';
+        }
+
+        splashScreenDelay = cfg.getPreferenceValue('SplashScreenDelay') || splashScreenDelay;
+        imageSrc = cfg.getPreferenceValue('SplashScreen') || imageSrc;
+        bgColor = cfg.getPreferenceValue('SplashScreenBackgroundColor') || bgColor;
+        splashImageWidth = cfg.getPreferenceValue('SplashScreenWidth') || splashImageWidth;
+        splashImageHeight = cfg.getPreferenceValue('SplashScreenHeight') || splashImageHeight;
+    } catch(e) {
+        var msg = '[Browser][SplashScreen] Error occured on loading preferences from config.xml: ' + JSON.stringify(e);
+        console.error(msg);
+        error(msg);
+    }
+}
+
+/**
+ * Shows and hides splashscreen if it is enabled, with a delay according the current preferences.
+ */
+function showAndHide() {
+    if(showSplashScreen) {
+        SplashScreen.show();
+
+        window.setTimeout(function() {
+            SplashScreen.hide();
+        }, splashScreenDelay);
+    }
+}
+
+/**
+ * Tries to read config.xml and override default properties and then shows and hides splashcreen if it is enabled.
+ */
+(function initAndShow() {
+    configHelper.readConfig(function(config) {
+        readPreferencesFromCfg(config);
+        showAndHide();
+    }, function(err) {
+        console.error(err);
+    });
+})();
+
+module.exports = SplashScreen;
+
+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


[5/7] cordova-plugin-splashscreen git commit: Revert "CB-8345 android: Make "splash" the default resource ID instead of null"

Posted by st...@apache.org.
Revert "CB-8345 android: Make "splash" the default resource ID instead of null"

This reverts commit 1d89a2aa1bf0b714d0debf5928cd85e66bbd090b.
There were some other changes in there that weren't meant to be made!


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

Branch: refs/heads/old-ID
Commit: ba6730e5941a4e33f8b38e80b038a741671bcc9f
Parents: 89c23fa
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Mar 30 09:46:55 2015 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 30 09:47:00 2015 -0400

----------------------------------------------------------------------
 src/android/SplashScreen.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/ba6730e5/src/android/SplashScreen.java
----------------------------------------------------------------------
diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java
index 4e2099e..ec3ad93 100644
--- a/src/android/SplashScreen.java
+++ b/src/android/SplashScreen.java
@@ -61,10 +61,10 @@ public class SplashScreen extends CordovaPlugin {
             return;
         }
         // Make WebView invisible while loading URL
-       // getView().setVisibility(View.INVISIBLE);
+        getView().setVisibility(View.INVISIBLE);
         int drawableId = preferences.getInteger("SplashDrawableId", 0);
         if (drawableId == 0) {
-            String splashResource = preferences.getString("SplashScreen", "splash");
+            String splashResource = preferences.getString("SplashScreen", null);
             if (splashResource != null) {
                 drawableId = cordova.getActivity().getResources().getIdentifier(splashResource, "drawable", cordova.getActivity().getClass().getPackage().getName());
                 if (drawableId == 0) {
@@ -191,7 +191,7 @@ public class SplashScreen extends CordovaPlugin {
                 root.setMinimumWidth(display.getWidth());
                 root.setOrientation(LinearLayout.VERTICAL);
 
-                // TODO: Use the background color of the webView's parent instead of using the
+                // TODO: Use the background color of the webview's parent instead of using the
                 // preference.
                 root.setBackgroundColor(preferences.getInteger("backgroundColor", Color.BLACK));
                 root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
@@ -258,12 +258,12 @@ public class SplashScreen extends CordovaPlugin {
         cordova.getActivity().runOnUiThread(new Runnable() {
             public void run() {
                 spinnerStop();
-                /*spinnerDialog = ProgressDialog.show(webView.getContext(), title, message, true, true,
+                spinnerDialog = ProgressDialog.show(webView.getContext(), title, message, true, true,
                         new DialogInterface.OnCancelListener() {
                             public void onCancel(DialogInterface dialog) {
                                 spinnerDialog = null;
                             }
-                        });*/
+                        });
             }
         });
     }


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


[4/7] cordova-plugin-splashscreen git commit: Use TRAVIS_BUILD_DIR, install paramedic by npm

Posted by st...@apache.org.
Use TRAVIS_BUILD_DIR, install paramedic by npm


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

Branch: refs/heads/old-ID
Commit: 89c23fad0361e6478878f7a3a7caf890e113453e
Parents: 1d89a2a
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Mar 24 23:43:27 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Mar 24 23:43:27 2015 -0700

----------------------------------------------------------------------
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/89c23fad/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9099647..fa7ae7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ node_js:
 install:
   - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config 
   - cd ..
-  - npm install -g purplecabbage/cordova-paramedic
+  - npm install -g cordova-paramedic
   - npm install -g cordova
   - npm install -g ios-sim
 script:
-  - cordova-paramedic --platform ios --plugin ../cordova-plugin-splashscreen
\ No newline at end of file
+  - cordova-paramedic --platform ios --plugin ${TRAVIS_BUILD_DIR}


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


[3/7] cordova-plugin-splashscreen git commit: CB-8345 android: Make "splash" the default resource ID instead of null

Posted by st...@apache.org.
CB-8345 android: Make "splash" the default resource ID instead of null


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

Branch: refs/heads/old-ID
Commit: 1d89a2aa1bf0b714d0debf5928cd85e66bbd090b
Parents: 0ff8d52
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Mar 24 14:49:20 2015 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Mar 24 14:50:09 2015 -0400

----------------------------------------------------------------------
 src/android/SplashScreen.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/1d89a2aa/src/android/SplashScreen.java
----------------------------------------------------------------------
diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java
index ec3ad93..4e2099e 100644
--- a/src/android/SplashScreen.java
+++ b/src/android/SplashScreen.java
@@ -61,10 +61,10 @@ public class SplashScreen extends CordovaPlugin {
             return;
         }
         // Make WebView invisible while loading URL
-        getView().setVisibility(View.INVISIBLE);
+       // getView().setVisibility(View.INVISIBLE);
         int drawableId = preferences.getInteger("SplashDrawableId", 0);
         if (drawableId == 0) {
-            String splashResource = preferences.getString("SplashScreen", null);
+            String splashResource = preferences.getString("SplashScreen", "splash");
             if (splashResource != null) {
                 drawableId = cordova.getActivity().getResources().getIdentifier(splashResource, "drawable", cordova.getActivity().getClass().getPackage().getName());
                 if (drawableId == 0) {
@@ -191,7 +191,7 @@ public class SplashScreen extends CordovaPlugin {
                 root.setMinimumWidth(display.getWidth());
                 root.setOrientation(LinearLayout.VERTICAL);
 
-                // TODO: Use the background color of the webview's parent instead of using the
+                // TODO: Use the background color of the webView's parent instead of using the
                 // preference.
                 root.setBackgroundColor(preferences.getInteger("backgroundColor", Color.BLACK));
                 root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
@@ -258,12 +258,12 @@ public class SplashScreen extends CordovaPlugin {
         cordova.getActivity().runOnUiThread(new Runnable() {
             public void run() {
                 spinnerStop();
-                spinnerDialog = ProgressDialog.show(webView.getContext(), title, message, true, true,
+                /*spinnerDialog = ProgressDialog.show(webView.getContext(), title, message, true, true,
                         new DialogInterface.OnCancelListener() {
                             public void onCancel(DialogInterface dialog) {
                                 spinnerDialog = null;
                             }
-                        });
+                        });*/
             }
         });
     }


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


[7/7] cordova-plugin-splashscreen git commit: CB-8653 updated translated docs to use new id

Posted by st...@apache.org.
CB-8653 updated translated docs to use new id


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

Branch: refs/heads/old-ID
Commit: 43e9c75345d9f426efca404d604673d2d1100727
Parents: 9b3f750
Author: Steve Gill <st...@gmail.com>
Authored: Tue Mar 31 10:53:32 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Mar 31 10:53:32 2015 -0700

----------------------------------------------------------------------
 doc/de/index.md | 2 +-
 doc/es/index.md | 2 +-
 doc/fr/index.md | 2 +-
 doc/it/index.md | 2 +-
 doc/ja/index.md | 2 +-
 doc/ko/index.md | 2 +-
 doc/pl/index.md | 2 +-
 doc/ru/index.md | 2 +-
 doc/zh/index.md | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/de/index.md
----------------------------------------------------------------------
diff --git a/doc/de/index.md b/doc/de/index.md
index efdc0f4..a270967 100644
--- a/doc/de/index.md
+++ b/doc/de/index.md
@@ -75,4 +75,4 @@ Zeigt den Begrüßungsbildschirm.
     navigator.splashscreen.show();
     
 
-Ihre Anwendung kann nicht `navigator.splashscreen.show()` aufrufen, bis die app begonnen hat und das `deviceready`-Ereignis ausgelöst hat. Aber da in der Regel der Splash-Screen soll sichtbar sein, bevor die Anwendung gestartet wurde, scheint die Niederlage der Zweck des Begrüßungsbildschirms. Somit einige Konfiguration in der Datei `config.xml` werden automatisch die Splash `show` sofort nach Ihrer app-Start und Bildschirm bevor es voll begonnen hat, und das `deviceready`-Ereignis empfangen. Weitere Informationen zu dieser Konfiguration finden Sie unter [Symbole und Splash-Screens][1]. Aus diesem Grund ist es unwahrscheinlich, dass Sie `navigator.splashscreen.show()` damit den Splash-Screen sichtbar ist für app-Start aufrufen müssen.
\ No newline at end of file
+Ihre Anwendung kann nicht `navigator.splashscreen.show()` aufrufen, bis die app begonnen hat und das `deviceready`-Ereignis ausgelöst hat. Aber da in der Regel der Splash-Screen soll sichtbar sein, bevor die Anwendung gestartet wurde, scheint die Niederlage der Zweck des Begrüßungsbildschirms. Somit einige Konfiguration in der Datei `config.xml` werden automatisch die Splash `show` sofort nach Ihrer app-Start und Bildschirm bevor es voll begonnen hat, und das `deviceready`-Ereignis empfangen. Weitere Informationen zu dieser Konfiguration finden Sie unter [Symbole und Splash-Screens][1]. Aus diesem Grund ist es unwahrscheinlich, dass Sie `navigator.splashscreen.show()` damit den Splash-Screen sichtbar ist für app-Start aufrufen müssen.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/es/index.md
----------------------------------------------------------------------
diff --git a/doc/es/index.md b/doc/es/index.md
index 3a6d641..9aa30fe 100644
--- a/doc/es/index.md
+++ b/doc/es/index.md
@@ -73,4 +73,4 @@ Muestra la pantalla de bienvenida.
     Navigator.SplashScreen.Show();
     
 
-La aplicación no se puede llamar `navigator.splashscreen.show()` hasta que haya iniciado la aplicación y el `deviceready` evento ha despedido. Pero puesto que normalmente la pantalla está destinada a ser visible antes de que comience su aplicación, que parecería que el propósito de la pantalla de bienvenida. Proporcionar cierta configuración en `config.xml` automáticamente `show` la pantalla de presentación inmediatamente después de su lanzamiento de la aplicación y antes de ser completamente ha iniciado y recibió el `deviceready` evento. Ver [los iconos y salpicadura pantallas][1] para obtener más información sobre haciendo esta configuración. Por esta razón, es poco probable que necesitas llamar a `navigator.splashscreen.show()` para hacer la pantalla visible para el inicio de la aplicación.
\ No newline at end of file
+La aplicación no se puede llamar `navigator.splashscreen.show()` hasta que haya iniciado la aplicación y el `deviceready` evento ha despedido. Pero puesto que normalmente la pantalla está destinada a ser visible antes de que comience su aplicación, que parecería que el propósito de la pantalla de bienvenida. Proporcionar cierta configuración en `config.xml` automáticamente `show` la pantalla de presentación inmediatamente después de su lanzamiento de la aplicación y antes de ser completamente ha iniciado y recibió el `deviceready` evento. Ver [los iconos y salpicadura pantallas][1] para obtener más información sobre haciendo esta configuración. Por esta razón, es poco probable que necesitas llamar a `navigator.splashscreen.show()` para hacer la pantalla visible para el inicio de la aplicación.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/fr/index.md
----------------------------------------------------------------------
diff --git a/doc/fr/index.md b/doc/fr/index.md
index c40beca..7b8c47f 100644
--- a/doc/fr/index.md
+++ b/doc/fr/index.md
@@ -75,4 +75,4 @@ Affiche l'écran de démarrage.
     navigator.splashscreen.show();
     
 
-Votre application ne peut pas appeler `navigator.splashscreen.show()` jusqu'à ce que l'application a commencé et l'événement `deviceready` est déclenché. Mais puisqu'en général, l'écran de démarrage est destiné à être visible avant que votre application a commencé, qui semblerait à l'encontre des objectifs de l'écran de démarrage. Fournir une configuration dans le fichier `config.xml` automatiquement `show` le splash projettera immédiatement après votre lancement de l'app et avant qu'il a complètement démarré et a reçu l'événement `deviceready`. Voir les [icônes et les écrans de démarrage][1] pour plus d'informations sur la conduite de cette configuration. Pour cette raison, il est peu probable que vous devez appeler `navigator.splashscreen.show()` pour rendre l'écran de démarrage visible pour le démarrage de l'application.
\ No newline at end of file
+Votre application ne peut pas appeler `navigator.splashscreen.show()` jusqu'à ce que l'application a commencé et l'événement `deviceready` est déclenché. Mais puisqu'en général, l'écran de démarrage est destiné à être visible avant que votre application a commencé, qui semblerait à l'encontre des objectifs de l'écran de démarrage. Fournir une configuration dans le fichier `config.xml` automatiquement `show` le splash projettera immédiatement après votre lancement de l'app et avant qu'il a complètement démarré et a reçu l'événement `deviceready`. Voir les [icônes et les écrans de démarrage][1] pour plus d'informations sur la conduite de cette configuration. Pour cette raison, il est peu probable que vous devez appeler `navigator.splashscreen.show()` pour rendre l'écran de démarrage visible pour le démarrage de l'application.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/it/index.md
----------------------------------------------------------------------
diff --git a/doc/it/index.md b/doc/it/index.md
index f662d09..b9c0e75 100644
--- a/doc/it/index.md
+++ b/doc/it/index.md
@@ -75,4 +75,4 @@ Visualizza la schermata iniziale.
     navigator.splashscreen.show();
     
 
-L'applicazione non può chiamare `navigator.splashscreen.show()` fino a quando l'app ha iniziato e ha generato l'evento `deviceready`. Ma poiché in genere la schermata iniziale è destinata ad essere visibile prima app ha iniziato, che sembrerebbe per sconfiggere lo scopo della schermata iniziale. Fornendo qualche configurazione nel `file config.xml` sarà automaticamente `show` il tonfo schermo subito dopo il lancio dell'app e prima che completamente ha iniziato e ha ricevuto l'evento `deviceready`. Per ulteriori informazioni su facendo questa configurazione, vedere [icone e schermate iniziali][1]. Per questo motivo, è improbabile che dovete chiamare `navigator.splashscreen.show()` per rendere la schermata visibile per avvio di app.
\ No newline at end of file
+L'applicazione non può chiamare `navigator.splashscreen.show()` fino a quando l'app ha iniziato e ha generato l'evento `deviceready`. Ma poiché in genere la schermata iniziale è destinata ad essere visibile prima app ha iniziato, che sembrerebbe per sconfiggere lo scopo della schermata iniziale. Fornendo qualche configurazione nel `file config.xml` sarà automaticamente `show` il tonfo schermo subito dopo il lancio dell'app e prima che completamente ha iniziato e ha ricevuto l'evento `deviceready`. Per ulteriori informazioni su facendo questa configurazione, vedere [icone e schermate iniziali][1]. Per questo motivo, è improbabile che dovete chiamare `navigator.splashscreen.show()` per rendere la schermata visibile per avvio di app.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/ja/index.md
----------------------------------------------------------------------
diff --git a/doc/ja/index.md b/doc/ja/index.md
index 913a5cf..869dad9 100644
--- a/doc/ja/index.md
+++ b/doc/ja/index.md
@@ -75,4 +75,4 @@ Foo ができれば 9 パッチファイル splashscreen ファイルの名前
     navigator.splashscreen.show();
     
 
-アプリが開始され、`deviceready` イベントが発生するまで、アプリケーションは `navigator.splashscreen.show()` を呼び出すことはできません。 しかし、以来、通常スプラッシュ画面アプリ開始前に表示するものですと思われる、スプラッシュ スクリーンの目的の敗北します。 `config.xml` にいくつかの構成を提供するは自動的に `表示` スプラッシュ画面、アプリを起動後すぐに、それが完全に起動し、`deviceready` イベントを受信する前に。 詳細についてはこの構成を行うには、[アイコンとスプラッシュ画面][1] を参照してください。 この理由のためにアプリ起動時のスプラッシュ スクリーンを確認 `navigator.splashscreen.show()` をコールする必要がある可能性が高いです。
\ No newline at end of file
+アプリが開始され、`deviceready` イベントが発生するまで、アプリケーションは `navigator.splashscreen.show()` を呼び出すことはできません。 しかし、以来、通常スプラッシュ画面アプリ開始前に表示するものですと思われる、スプラッシュ スクリーンの目的の敗北します。 `config.xml` にいくつかの構成を提供するは自動的に `表示` スプラッシュ画面、アプリを起動後すぐに、それが完全に起動し、`deviceready` イベントを受信する前に。 詳細についてはこの構成を行うには、[アイコンとスプラッシュ画面][1] を参照してください。 この理由のためにアプリ起動時のスプラッシュ スクリーンを確認 `navigator.splashscreen.show()` をコールする必要がある可能性が高いです。

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/ko/index.md
----------------------------------------------------------------------
diff --git a/doc/ko/index.md b/doc/ko/index.md
index bf9990a..f02fca5 100644
--- a/doc/ko/index.md
+++ b/doc/ko/index.md
@@ -75,4 +75,4 @@
     navigator.splashscreen.show();
     
 
-응용 프로그램 시작 및 `deviceready` 이벤트는 발생 될 때까지 응용 프로그램이 `navigator.splashscreen.show()`을 호출할 수 없습니다. 하지만 그 스플래시 스크린의 목적 것 같다 일반적으로 시작 화면이 당신의 애플 리 케이 션 시작 하기 전에 표시 될 운명이 다, 이후. `config.xml에서` 몇 가지 구성을 제공 하 자동으로 스플래시 `표시` 화면 애플 리 케이 션 출시 직후와 그것은 완벽 하 게 시작 하 고 `deviceready` 이벤트를 받은 전에. 이 구성 하 고 자세한 내용은 [아이콘 및 시작 화면을][1] 참조 하십시오. 이러한 이유로, 그것은 가능성이 시작 화면은 응용 프로그램 시작에 대 한 표시 되도록 `navigator.splashscreen.show()`를 호출 해야입니다.
\ No newline at end of file
+응용 프로그램 시작 및 `deviceready` 이벤트는 발생 될 때까지 응용 프로그램이 `navigator.splashscreen.show()`을 호출할 수 없습니다. 하지만 그 스플래시 스크린의 목적 것 같다 일반적으로 시작 화면이 당신의 애플 리 케이 션 시작 하기 전에 표시 될 운명이 다, 이후. `config.xml에서` 몇 가지 구성을 제공 하 자동으로 스플래시 `표시` 화면 애플 리 케이 션 출시 직후와 그것은 완벽 하 게 시작 하 고 `deviceready` 이벤트를 받은 전에. 이 구성 하 고 자세한 내용은 [아이콘 및 시작 화면을][1] 참조 하십시오. 이러한 이유로, 그것은 가능성이 시작 화면은 응용 프로그램 시작에 대 한 표시 되도록 `navigator.splashscreen.show()`를 호출 해야입니다.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/pl/index.md
----------------------------------------------------------------------
diff --git a/doc/pl/index.md b/doc/pl/index.md
index 4a30bf5..fa89def 100644
--- a/doc/pl/index.md
+++ b/doc/pl/index.md
@@ -75,4 +75,4 @@ Wyświetla ekran powitalny.
     navigator.splashscreen.show();
     
 
-Aplikacja nie można wywołać `navigator.splashscreen.show()`, aż aplikacja została uruchomiona i zdarzenie `deviceready` został zwolniony. Ale ponieważ zazwyczaj opryskać tęcza ma być widoczne przed rozpoczęciem aplikacji, wydaje się sprzeczne z celem ekranu powitalnego. Dostarczanie niektórych konfiguracji w `pliku config.xml` będzie automatycznie `show` splash na ekranie natychmiast po uruchomienie aplikacji i przed pełni rozpoczął i odebrał zdarzenie `deviceready`. Aby uzyskać więcej informacji na robienie tej konfiguracji, zobacz [ikony i ekrany powitalne w aplikacjach][1]. Z tego powodu jest mało prawdopodobne, należy zadzwonić `navigator.splashscreen.show()`, aby wyświetlić ekran powitalny dla uruchamiania aplikacji.
\ No newline at end of file
+Aplikacja nie można wywołać `navigator.splashscreen.show()`, aż aplikacja została uruchomiona i zdarzenie `deviceready` został zwolniony. Ale ponieważ zazwyczaj opryskać tęcza ma być widoczne przed rozpoczęciem aplikacji, wydaje się sprzeczne z celem ekranu powitalnego. Dostarczanie niektórych konfiguracji w `pliku config.xml` będzie automatycznie `show` splash na ekranie natychmiast po uruchomienie aplikacji i przed pełni rozpoczął i odebrał zdarzenie `deviceready`. Aby uzyskać więcej informacji na robienie tej konfiguracji, zobacz [ikony i ekrany powitalne w aplikacjach][1]. Z tego powodu jest mało prawdopodobne, należy zadzwonić `navigator.splashscreen.show()`, aby wyświetlić ekran powitalny dla uruchamiania aplikacji.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/ru/index.md
----------------------------------------------------------------------
diff --git a/doc/ru/index.md b/doc/ru/index.md
index 1f87227..20bea01 100644
--- a/doc/ru/index.md
+++ b/doc/ru/index.md
@@ -72,4 +72,4 @@
     Navigator.SplashScreen.Show();
     
 
-Ваше приложение не может вызвать `navigator.splashscreen.show()` до тех пор, пока приложение началась и `deviceready` событие инициировано. Но поскольку обычно экран-заставка должен быть видимым до начала вашего приложения, что казалось бы поражение цели экрана-заставки. Предоставление некоторых конфигурации в `config.xml` будет автоматически `show` экран-заставку сразу же после запуска вашего приложения и перед его полностью запущен и получил `deviceready` событие. Увидеть [иконки и заставки][1] для получения дополнительной информации на делать этой конфигурации. По этой
  причине маловероятно, вам нужно вызвать `navigator.splashscreen.show()` для отображения экрана-заставки для запуска приложения.
\ No newline at end of file
+Ваше приложение не может вызвать `navigator.splashscreen.show()` до тех пор, пока приложение началась и `deviceready` событие инициировано. Но поскольку обычно экран-заставка должен быть видимым до начала вашего приложения, что казалось бы поражение цели экрана-заставки. Предоставление некоторых конфигурации в `config.xml` будет автоматически `show` экран-заставку сразу же после запуска вашего приложения и перед его полностью запущен и получил `deviceready` событие. Увидеть [иконки и заставки][1] для получения дополнительной информации на делать этой конфигурации. По этой
  причине маловероятно, вам нужно вызвать `navigator.splashscreen.show()` для отображения экрана-заставки для запуска приложения.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/43e9c753/doc/zh/index.md
----------------------------------------------------------------------
diff --git a/doc/zh/index.md b/doc/zh/index.md
index c505dd1..e5fb3d2 100644
--- a/doc/zh/index.md
+++ b/doc/zh/index.md
@@ -75,4 +75,4 @@
     navigator.splashscreen.show();
     
 
-您的應用程式無法調用 `navigator.splashscreen.show()`,直到該應用程式已啟動,且觸發了 `deviceready` 事件。 但是,由於通常的閃屏為了是可見的在您的應用程式啟動之前,這似乎會打敗閃屏的目的。 提供一些配置在 `config.xml` 中的會自動 `show` 初始螢幕您的應用程式啟動後立即和之前它已經完全起步並收到 `deviceready` 事件。 做這種配置的詳細資訊,請參閱 [圖示和啟動畫面][1]。 出於此原因,不太可能您需要調用 `navigator.splashscreen.show()`,使初始螢幕可見為應用程式啟動。
\ No newline at end of file
+您的應用程式無法調用 `navigator.splashscreen.show()`,直到該應用程式已啟動,且觸發了 `deviceready` 事件。 但是,由於通常的閃屏為了是可見的在您的應用程式啟動之前,這似乎會打敗閃屏的目的。 提供一些配置在 `config.xml` 中的會自動 `show` 初始螢幕您的應用程式啟動後立即和之前它已經完全起步並收到 `deviceready` 事件。 做這種配置的詳細資訊,請參閱 [圖示和啟動畫面][1]。 出於此原因,不太可能您需要調用 `navigator.splashscreen.show()`,使初始螢幕可見為應用程式啟動。


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


[6/7] cordova-plugin-splashscreen git commit: CB-8345 Make default for splashscreen resource "screen" (which is what template and CLI assume it to be)

Posted by st...@apache.org.
CB-8345 Make default for splashscreen resource "screen" (which is what template and CLI assume it to be)


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

Branch: refs/heads/old-ID
Commit: 9b3f750085c08de9a4210079af52786851da4f80
Parents: ba6730e
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Mar 30 09:48:04 2015 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 30 09:48:04 2015 -0400

----------------------------------------------------------------------
 src/android/SplashScreen.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/9b3f7500/src/android/SplashScreen.java
----------------------------------------------------------------------
diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java
index ec3ad93..d84eea4 100644
--- a/src/android/SplashScreen.java
+++ b/src/android/SplashScreen.java
@@ -64,7 +64,7 @@ public class SplashScreen extends CordovaPlugin {
         getView().setVisibility(View.INVISIBLE);
         int drawableId = preferences.getInteger("SplashDrawableId", 0);
         if (drawableId == 0) {
-            String splashResource = preferences.getString("SplashScreen", null);
+            String splashResource = preferences.getString("SplashScreen", "screen");
             if (splashResource != null) {
                 drawableId = cordova.getActivity().getResources().getIdentifier(splashResource, "drawable", cordova.getActivity().getClass().getPackage().getName());
                 if (drawableId == 0) {


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


[2/7] cordova-plugin-splashscreen git commit: docs: added Windows to supported platforms

Posted by st...@apache.org.
docs: added Windows to supported platforms


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

Branch: refs/heads/old-ID
Commit: 0ff8d520811d18a09fadd40affe92f3e58f1818e
Parents: bb65993
Author: sgrebnov <v-...@microsoft.com>
Authored: Thu Mar 19 18:24:40 2015 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Thu Mar 19 18:24:40 2015 +0300

----------------------------------------------------------------------
 README.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/0ff8d520/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d8496ff..e085993 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ This plugin displays and hides a splash screen during application launch.
 - iOS
 - Windows Phone 7 and 8
 - Windows 8
+- Windows
 - Browser
 
 


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