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

reset https flag on new scan

Browse source
This commit is contained in:
Marty Alcala 2016-10-19 15:23:54 -04:00
commit 62a6a732ed
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/directives/actionSheet.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.directives') angular.module('copayApp.directives')
.directive('actionSheet', function($rootScope) { .directive('actionSheet', function($rootScope, $timeout) {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'views/includes/actionSheet.html', templateUrl: 'views/includes/actionSheet.html',
@ -10,6 +10,13 @@ angular.module('copayApp.directives')
show: '=actionSheetShow', show: '=actionSheetShow',
}, },
link: function(scope, element, attrs) { link: function(scope, element, attrs) {
scope.$watch('show', function() {
if(scope.show) {
$timeout(function() { scope.revealMenu = true; }, 100);
} else {
scope.revealMenu = false;
}
});
scope.hide = function() { scope.hide = function() {
scope.show = false; scope.show = false;
$rootScope.$broadcast('incomingDataMenu.menuHidden'); $rootScope.$broadcast('incomingDataMenu.menuHidden');

1
src/js/directives/incomingDataMenu.js
View file

@ -11,6 +11,7 @@ angular.module('copayApp.directives')
scope.data = data.data; scope.data = data.data;
scope.type = data.type; scope.type = data.type;
scope.showMenu = true; scope.showMenu = true;
scope.https = false;
console.log('scope.type', scope.type); console.log('scope.type', scope.type);
if(scope.type === 'url') { if(scope.type === 'url') {