From 8c8bbd6cd387985f03158fbe0df800db3d640e68 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 14 Oct 2016 16:03:53 -0400 Subject: [PATCH] wire rootscope event to incoming data menu --- src/js/directives/incomingDataMenu.js | 9 ++------- src/js/services/incomingData.js | 13 +++++++++---- www/views/includes/incomingDataMenu.html | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js index 0c1184503..79d97f612 100644 --- a/src/js/directives/incomingDataMenu.js +++ b/src/js/directives/incomingDataMenu.js @@ -6,21 +6,16 @@ angular.module('copayApp.directives') restrict: 'E', templateUrl: 'views/includes/incomingDataMenu.html', link: function(scope, element, attrs) { - $rootScope.$on('incomingDataMenu.showMenu', function() { - console.log('in showMenu handler'); + $rootScope.$on('incomingDataMenu.showMenu', function(event, data) { $timeout(function() { - console.log('in showMenu timeout'); + scope.data = data; scope.showMenu = true; }); }); - $timeout(function() { - scope.showMenu = true; - }, 2000); scope.hide = function() { scope.showMenu = false; }; scope.$watch('showMenu', function() { - console.log('scope.showMenu', scope.showMenu); if(!scope.showMenu) { $rootScope.$broadcast('incomingDataMenu.menuHidden'); } diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index fa63e2941..38a70c2a8 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -4,11 +4,16 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni var root = {}; - root.showMenu = function() { - $rootScope.$broadcast('incomingDataMenu.showMenu'); + root.showMenu = function(data) { + $rootScope.$broadcast('incomingDataMenu.showMenu', data); }; - root.redir = function(data, resumeScan) { + $timeout(function() { + var data = 'https://bitpay.com'; + root.redir(data); + }, 2000); + + root.redir = function(data) { $log.debug('Processing incoming data:' +data); function sanitizeUri(data) { @@ -69,7 +74,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni getPayProDetails(data, function(err, details) { if(err) { console.log('getPayProDetails err', err); - root.showMenu(); + root.showMenu(data); return; } console.log('paypro details', details); diff --git a/www/views/includes/incomingDataMenu.html b/www/views/includes/incomingDataMenu.html index 3ea01fa56..668c05d58 100644 --- a/www/views/includes/incomingDataMenu.html +++ b/www/views/includes/incomingDataMenu.html @@ -7,11 +7,11 @@
- https://bitpay.com + {{data}}
- +
Open website