From 3c00a4a06c2e75d5c899fcec05abce6dc0d60640 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 23 Apr 2015 17:45:32 -0300 Subject: [PATCH] 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 @@