From 3c00a4a06c2e75d5c899fcec05abce6dc0d60640 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 23 Apr 2015 17:45:32 -0300 Subject: [PATCH 1/2] Revert "rm fastclick" This reverts commit ea7484512f4bca1c91e7b635e5fc11addb49306c. Conflicts: src/js/controllers/index.js --- Gruntfile.js | 1 + bower.json | 1 + public/views/includes/menu.html | 3 ++- src/js/controllers/index.js | 4 +--- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 005e0e602..14a621b13 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -78,6 +78,7 @@ module.exports = function(grunt) { }, angular: { src: [ + 'bower_components/fastclick/lib/fastclick.js', 'bower_components/qrcode-generator/js/qrcode.js', 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/moment/min/moment-with-locales.js', diff --git a/bower.json b/bower.json index d90c214cb..87666e046 100644 --- a/bower.json +++ b/bower.json @@ -21,6 +21,7 @@ "angular-bitcore-wallet-client": "^0.0.18", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", + "fastclick": "*", "angular-ui-switch": "~0.1.0" }, "resolutions": { diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index f9d0c767d..d1cf44609 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -1,7 +1,8 @@
- +
{{item.title|translate}} diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index b53b798c5..2a3b1df4f 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -13,8 +13,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.menu = [{ 'title': 'Home', 'icon': 'icon-home', - 'link': 'walletHome', - 'active': true, + 'link': 'walletHome' }, { 'title': 'Receive', 'icon': 'icon-receive', @@ -104,7 +103,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; self.setTab = function(tab) { - if (self.tab === tab) return; From 1f403468e644dca2ed1a4e5f1b701c4e6ebe8539 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 23 Apr 2015 18:05:31 -0300 Subject: [PATCH 2/2] attack fastclick --- src/js/controllers/index.js | 6 ++++-- src/js/init.js | 7 ------- src/js/routes.js | 4 ++++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 2a3b1df4f..d2b241eda 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -121,8 +121,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (document.getElementById(tab)) { document.getElementById(tab).className = 'tab-in tab-view ' + tab; var newe = document.getElementById('menu-' + tab); - newe.className = 'active'; - newe.style.borderTopColor = self.backgroundColor; + if (newe) { + newe.className = 'active'; + newe.style.borderTopColor = self.backgroundColor; + } } self.tab = tab; diff --git a/src/js/init.js b/src/js/init.js index 0b3f01085..21cd08a5e 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -9,13 +9,6 @@ angular.element(document).ready(function() { /* Cordova specific Init */ if (window.cordova !== undefined) { - // Fastclick event - if ('addEventListener' in document) { - document.addEventListener('DOMContentLoaded', function() { - FastClick.attach(document.body); - }, false); - } - document.addEventListener('deviceready', function() { document.addEventListener('pause', function() { diff --git a/src/js/routes.js b/src/js/routes.js index b8122ac63..7b162f30e 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -376,6 +376,10 @@ angular }); }) .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService) { + + console.log('Attaching FastClick'); + FastClick.attach(document.body); + // Auto-detect browser language var userLang, androidLang;