Merge branch 'release/1.0.5'

This commit is contained in:
Ghislain Loaec 2015-12-08 09:57:01 +01:00
commit 22758df307
5 changed files with 29 additions and 4 deletions

View File

@ -26,6 +26,7 @@ Install cordovas plugins:
phonegap plugin add cordova-plugin-file-transfer
phonegap plugin add cordova-plugin-zip
phonegap plugin add cordova-plugin-whitelist
phonegap plugin add cordova-plugin-statusbar
phonegap plugin add cordova-plugin-inappbrowser # optional
If plugin registry server seems to be down :'( use git instead ;)
@ -34,6 +35,7 @@ If plugin registry server seems to be down :'( use git instead ;)
phonegap plugin add https://github.com/apache/cordova-plugin-file-transfer.git
phonegap plugin add https://github.com/MobileChromeApps/cordova-plugin-zip.git
phonegap plugin add https://github.com/apache/cordova-plugin-whitelist.git
phonegap plugin add https://github.com/apache/cordova-plugin-statusbar.git
phonegap plugin add https://github.com/apache/cordova-plugin-inappbrowser.git # optional
## Assets Management

View File

@ -14,8 +14,16 @@
<preference name="fullscreen" value="false" />
<preference name="webviewbounce" value="true" />
<preference name="prerendered-icon" value="true" />
<preference name="stay-in-webview" value="false" />
<preference name="stay-in-webview" value="true" />
<preference name="ios-statusbarstyle" value="black-opaque" />
<preference name="ios-darkstatusbar" value="true" />
<!-- this code makes the statusbar text white -->
<gap:config-file platform="ios" parent="UIViewControllerBasedStatusBarAppearance">
<false/>
</gap:config-file>
<gap:config-file platform="ios" parent="UIStatusBarStyle">
<string>UIStatusBarStyleLightContent</string>
</gap:config-file>
<preference name="detect-data-types" value="true" />
<preference name="exit-on-suspend" value="false" />
<preference name="show-splash-screen-spinner" value="true" />
@ -23,6 +31,9 @@
<preference name="disable-cursor" value="false" />
<preference name="android-minSdkVersion" value="10" />
<preference name="android-installLocation" value="auto" />
<preference name="StatusBarOverlaysWebView" value="false" />
<preference name="StatusBarBackgroundColor" value="#000000" />
<preference name="StatusBarStyle" value="blackopaque" />
<feature name="http://api.phonegap.com/1.0/file" />
<gap:plugin name="org.apache.cordova.file" version="1.3.1" />
<gap:plugin name="org.apache.cordova.file-transfer" version="0.4.6" />
@ -58,7 +69,7 @@
<gap:splash gap:platform="ios" height="1024" src="www/res/screen/ios/screen-ipad-portrait.png" width="768" />
<gap:splash gap:platform="ios" height="768" src="www/res/screen/ios/screen-ipad-landscape.png" width="1024" />
<gap:splash gap:platform="winphone" src="www/res/screen/windows-phone/screen-portrait.jpg" />
<access origin="*" />
<allow-navigation href="*" />
<!-- Allow links to web pages to open in a browser -->
<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
@ -68,4 +79,5 @@
<allow-intent href="tel:*" />
<!-- Allow geo: links to open maps -->
<allow-intent href="geo:*" />
<access origin="*" />
</widget>

View File

@ -33,6 +33,10 @@
{
"xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
},
{
"xml": "<feature name=\"StatusBar\"><param name=\"android-package\" value=\"org.apache.cordova.statusbar.StatusBar\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
}
],
"/widget": [
@ -70,6 +74,9 @@
},
"cordova-plugin-zip": {
"PACKAGE_NAME": "com.cadoles.momo"
},
"cordova-plugin-statusbar": {
"PACKAGE_NAME": "com.cadoles.momo"
}
},
"dependent_plugins": {}

View File

@ -29,8 +29,12 @@
<meta http-Equiv="Pragma" Content="no-cache" />
<meta http-Equiv="Expires" Content="0" />
<!-- Enable all requests, inline styles, and eval() -->
<!--meta http-equiv="Content-Security-Policy" content="default-src *;
style-src * 'unsafe-inline'; script-src * 'unsafe-inline'
'unsafe-eval'"-->
<meta http-equiv="Content-Security-Policy" content="default-src *;
style-src * 'unsafe-inline'; script-src * 'unsafe-inline' 'unsafe-eval'">
style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'
'unsafe-eval'">
<!-- WARNING: for iOS 7, remove the width=device-width and height=device-height attributes. See https://issues.apache.org/jira/browse/CB-4323 -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, target-densitydpi=medium-dpi, user-scalable=0" />

View File

@ -240,12 +240,12 @@ var app = {
case Connection.WIFI:
case Connection.CELL_4G:
case Connection.CELL_3G:
case Connection.CELL_2G:
app.online = true;
if(typeof resolve === "function"){
resolve();
}
break;
case Connection.CELL_2G:
case Connection.NONE:
case Connection.UNKNOWN:
default: