From f3b235acb9bfedb02ad13bd10bd42688b287bafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Guiselin?=
<jeremy.guiselin@datadoghq.com>
Date: Fri, 10 Feb 2017 14:13:56 -0500
Subject: [PATCH] Fix wave
---
bower.json | 2 +-
package.json | 1 +
scss/notification.scss | 1 +
www/js/app.js | 4 ++--
www/js/pages/notifications/controller.js | 5 ++++-
www/js/pages/notifications/template.html | 2 +-
www/manifest.json | 4 +---
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/bower.json b/bower.json
index 84b6527..e2f5ef6 100644
--- a/bower.json
+++ b/bower.json
@@ -14,7 +14,7 @@
"ionic-img-cache": "^1.1.1"
},
"devDependencies": {
- "platform.js": "platform#^1.3.1",
+ "platform.js": "platform#^1.3.3",
"ionic-platform-web-client": "^0.7.1"
}
}
diff --git a/package.json b/package.json
index 84d3176..20f1483 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
"dependencies": {
"gulp": "^3.5.6",
"gulp-concat": "^2.2.0",
+ "gulp-filter": "^5.0.0",
"gulp-minify-css": "^0.3.0",
"gulp-rename": "^1.2.0",
"gulp-sass": "^2.0.4"
diff --git a/scss/notification.scss b/scss/notification.scss
index f9388d6..d80101c 100644
--- a/scss/notification.scss
+++ b/scss/notification.scss
@@ -38,6 +38,7 @@
font-size: 17px;
color: $blackColor;
text-align: justify;
+ white-space: initial;
}
.info-button {
diff --git a/www/js/app.js b/www/js/app.js
index e84fcc2..5970383 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -20,7 +20,7 @@
"facebook_link": "fb://page/1964315240459744",
"twitter_link": "https://twitter.com/betskills",
"instagram_link": "instagram://user?username=betskills",
- "daily_predictions": "Daily Predictions",
+ "daily_predictions": "Weekly Predictions",
"all_predictions": "All the predictions",
"unlock": "Unlock",
"predictions": "Predictions",
@@ -48,7 +48,7 @@
"facebook_link": "fb://page/1757105857849857",
"twitter_link": "https://twitter.com/betskills_fr",
"instagram_link": "instagram://user?username=betskills_fr",
- "daily_predictions": "Prédictions gratuites",
+ "daily_predictions": "Prédictions de la semaine",
"all_predictions": "Toutes les prédictions",
"unlock": "Dévérouiller",
"predictions": "Prédictions",
diff --git a/www/js/pages/notifications/controller.js b/www/js/pages/notifications/controller.js
index 2b3b421..44ba951 100644
--- a/www/js/pages/notifications/controller.js
+++ b/www/js/pages/notifications/controller.js
@@ -96,7 +96,10 @@
$scope.$on("$ionicView.beforeEnter", function(event, data){
// Each time we open the notification page, we clean the badge
- window.FirebasePlugin.setBadgeNumber(0);
+
+ if (window.cordova) {
+ window.FirebasePlugin.setBadgeNumber(0);
+ }
$ionicLoading.show({
template: '<ion-spinner icon="ripple" class="spinner-assertive"></ion-spinner>',
diff --git a/www/js/pages/notifications/template.html b/www/js/pages/notifications/template.html
index f9c2cf2..2997273 100644
--- a/www/js/pages/notifications/template.html
+++ b/www/js/pages/notifications/template.html
@@ -1,6 +1,6 @@
<ion-view cache-view="true" title="Notifications">
<ion-nav-buttons side="right">
- <img ui-sref="info" class="info-icon" src="img/info.png" alt="info">
+ <img ui-sref="info" class="info-icon infobulle" src="img/info.png" alt="info">
</ion-nav-buttons>
<ion-content class="has-header">
<ion-list>
diff --git a/www/manifest.json b/www/manifest.json
index 2a30494..51622d6 100644
--- a/www/manifest.json
+++ b/www/manifest.json
@@ -1,6 +1,4 @@
{
"play_store_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs06saHKaKvyRbwiZOtg9sTM0nn8q3cjoQbVJK0jOEDDG9q4cB852cYYROBYDFwUCM0Yz2oSOZ0SBEVBpUxDcMu9tasH9EekLbjBSC15bLJIx44mqsWL1CkOo/Z19B81IITJ7v7Hz3adst5PAvi5OgZiJSrlEMJlKPrQwSFy9do6NeVwixxbdWlzbf8fcLL2RTiQgJVt7+SGzgjgaiGjGGZRN1sYKhIk8k6vgj7pgV1vRM5crVGnnQKf6AIBfkymsfMQTcoUF/StSEBuMOEjHZs/dmYI1GFrdUbFQK/EsLDv6PDUaMYvGKvr8lqdkcEYiKp/BQ7Db7UMuiWUUjtl4QwIDAQAB
"
-}
-
-jarsigner -verbose -sigalg SHA256withRSA -keystore ../Resources/key2.jks platforms/android/build/outputs/apk/android-release-unsigned.apk -storepass bruno7707 Testing
+}
\ No newline at end of file
--
GitLab