Skip to content
Snippets Groups Projects
Commit f577a041 authored by Jérémy Guiselin's avatar Jérémy Guiselin
Browse files

fix wave

parent fb359d23
Branches
No related tags found
No related merge requests found
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
window.facebookConnectPlugin.logEvent('fb_mobile_first_app_launch'); window.facebookConnectPlugin.logEvent('fb_mobile_first_app_launch');
} }
if (ionic.Platform.isIOS()) { if (ionic.Platform.isIOS() && window.cordova) {
window.FirebasePlugin.grantPermission(); window.FirebasePlugin.grantPermission();
} }
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
var deregistrationCallbackList = []; var deregistrationCallbackList = [];
var self = this; var self = this;
self.shouldUp = false;
/** /**
End Controller variables End Controller variables
...@@ -86,6 +87,18 @@ ...@@ -86,6 +87,18 @@
$scope.predictionsNumber += league.predictions_number; $scope.predictionsNumber += league.predictions_number;
} }
var list = angular.element(document.querySelector('#list-packs .list'));
var ionContent = angular.element(document.querySelector('ion-content'))[0];
if (self.shouldUp && $scope.selected.length > 0) {
list.css('marginBottom', '50px');
if (ionContent.scrollTop >= 340) {
ionContent.scrollTop = ionContent.scrollHeight;
}
} else if (self.shouldUp && $scope.selected.length == 0) {
list.css('marginBottom', '0');
}
var price = self.findPrice($scope.selected.length); var price = self.findPrice($scope.selected.length);
$scope.price = price; $scope.price = price;
$scope.$parent.$parent.select($scope.selected, price, $scope.predictionsNumber, 'football', self.findPack($scope.selected.length)); $scope.$parent.$parent.select($scope.selected, price, $scope.predictionsNumber, 'football', self.findPack($scope.selected.length));
...@@ -274,6 +287,11 @@ ...@@ -274,6 +287,11 @@
}); });
$scope.freePredictions = freePredictions; $scope.freePredictions = freePredictions;
$scope.leagues = data[1]['data']; $scope.leagues = data[1]['data'];
if ($scope.leagues.length >= 3) {
self.shouldUp = true;
}
if (window.cordova) { if (window.cordova) {
self.products = data[2]; self.products = data[2];
} else { } else {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
var deregistrationCallbackList = []; var deregistrationCallbackList = [];
var self = this; var self = this;
self.shouldUp = false;
/** /**
End Controller variables End Controller variables
...@@ -84,6 +85,18 @@ ...@@ -84,6 +85,18 @@
$scope.predictionsNumber += league.predictions_number; $scope.predictionsNumber += league.predictions_number;
} }
var list = angular.element(document.querySelector('#list-packs .list'));
var ionContent = angular.element(document.querySelector('ion-content'))[0];
if (self.shouldUp && $scope.selected.length > 0) {
list.css('marginBottom', '50px');
if (ionContent.scrollTop >= 340) {
ionContent.scrollTop = ionContent.scrollHeight;
}
} else if (self.shouldUp && $scope.selected.length == 0) {
list.css('marginBottom', '0');
}
var price = self.findPrice($scope.selected.length); var price = self.findPrice($scope.selected.length);
$scope.price = price; $scope.price = price;
$scope.$parent.$parent.select($scope.selected, price, $scope.predictionsNumber, 'tennis', self.findPack()); $scope.$parent.$parent.select($scope.selected, price, $scope.predictionsNumber, 'tennis', self.findPack());
...@@ -247,6 +260,11 @@ ...@@ -247,6 +260,11 @@
}); });
$scope.freePredictions = freePredictions; $scope.freePredictions = freePredictions;
$scope.leagues = data[1]['data']; $scope.leagues = data[1]['data'];
if ($scope.leagues.length >= 3) {
self.shouldUp = true;
}
if (window.cordova) { if (window.cordova) {
self.products = data[2]; self.products = data[2];
} else { } else {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
<h3 class="title-section" translate="all_predictions"></h3> <h3 class="title-section" translate="all_predictions"></h3>
<ion-list> <ion-list id="list-packs">
<ion-item ng-repeat="league in leagues track by league.id" class="pack-item" ng-class="!isBought(league) ? 'locked' : ''"> <ion-item ng-repeat="league in leagues track by league.id" class="pack-item" ng-class="!isBought(league) ? 'locked' : ''">
<a ui-sref="{{getLink(league)}}" ng-click="!isBought(league) ? select(league) : ''"> <a ui-sref="{{getLink(league)}}" ng-click="!isBought(league) ? select(league) : ''">
<img src="img/lock.png" ng-hide="isBought(league)" class="lock" alt=""> <img src="img/lock.png" ng-hide="isBought(league)" class="lock" alt="">
...@@ -30,4 +30,3 @@ ...@@ -30,4 +30,3 @@
</a> </a>
</ion-item> </ion-item>
</ion-list> </ion-list>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment