From 62a6a732ed42ee707a125d24a4f08e7d17cf6442 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 19 Oct 2016 15:23:54 -0400 Subject: [PATCH] reset https flag on new scan --- src/js/directives/actionSheet.js | 9 ++++++++- src/js/directives/incomingDataMenu.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/js/directives/actionSheet.js b/src/js/directives/actionSheet.js index 646072849..6ea5cb292 100644 --- a/src/js/directives/actionSheet.js +++ b/src/js/directives/actionSheet.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.directives') - .directive('actionSheet', function($rootScope) { + .directive('actionSheet', function($rootScope, $timeout) { return { restrict: 'E', templateUrl: 'views/includes/actionSheet.html', @@ -10,6 +10,13 @@ angular.module('copayApp.directives') show: '=actionSheetShow', }, 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.show = false; $rootScope.$broadcast('incomingDataMenu.menuHidden'); diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js index c29f9c4ae..ee316f305 100644 --- a/src/js/directives/incomingDataMenu.js +++ b/src/js/directives/incomingDataMenu.js @@ -11,6 +11,7 @@ angular.module('copayApp.directives') scope.data = data.data; scope.type = data.type; scope.showMenu = true; + scope.https = false; console.log('scope.type', scope.type); if(scope.type === 'url') {