anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4572 from gabrielbazan7/fix/TermsWideScreen

Browse source 
hide menu in accept terms view
This commit is contained in:
Gustavo Maximiliano Cortez 2016-07-12 10:28:45 -03:00 • committed by GitHub
commit c4a4bbdd96
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/index.html
View file

@ -19,7 +19,7 @@
<ion-side-menus class="page" ng-controller="indexController as index"> <ion-side-menus class="page" ng-controller="indexController as index">
<!-- Left menu --> <!-- Left menu -->
<ion-side-menu side="left" expose-aside-when="large"> <ion-side-menu side="left" expose-aside-when="large" ng-if="isDisclaimerAccepted">
<div ng-include="'views/includes/sidebar.html'" ng-if="index.hasProfile"></div> <div ng-include="'views/includes/sidebar.html'" ng-if="index.hasProfile"></div>
</ion-side-menu> </ion-side-menu>

3
src/js/controllers/disclaimer.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('disclaimerController', angular.module('copayApp.controllers').controller('disclaimerController',
function($scope, $timeout, $log, $ionicSideMenuDelegate, profileService, applicationService, gettextCatalog, uxLanguage, go, storageService, gettext, platformInfo, ongoingProcess) { function($scope, $rootScope, $timeout, $log, $ionicSideMenuDelegate, profileService, applicationService, gettextCatalog, uxLanguage, go, storageService, gettext, platformInfo, ongoingProcess) {
var self = this; var self = this;
self.tries = 0; self.tries = 0;
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
@ -62,6 +62,7 @@ angular.module('copayApp.controllers').controller('disclaimerController',
if (err) $log.error(err); if (err) $log.error(err);
else { else {
$ionicSideMenuDelegate.canDragContent(true); $ionicSideMenuDelegate.canDragContent(true);
$rootScope.$emit('disclaimerAccepted');
go.walletHome(); go.walletHome();
} }
}); });

4
src/js/controllers/index.js
View file

@ -1677,6 +1677,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setTab(tab, reset); self.setTab(tab, reset);
}); });
$rootScope.$on('disclaimerAccepted', function(event) {
$scope.isDisclaimerAccepted = true;
});
$rootScope.$on('Local/WindowResize', function() { $rootScope.$on('Local/WindowResize', function() {
self.physicalScreenWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width); self.physicalScreenWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width);
}); });

1
src/js/services/profileService.js
View file

@ -226,6 +226,7 @@ angular.module('copayApp.services')
if (!val) { if (!val) {
return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer')); return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
} }
$rootScope.$emit('disclaimerAccepted');
return cb(); return cb();
}); });
}); });