Merge pull request #2596 from cmgustavo/bug/fastclick-again

Fastclick again
This commit is contained in:
Matias Pando 2015-04-23 12:10:36 -03:00
commit 19ccec1da4
2 changed files with 2 additions and 1 deletions

View file

@ -78,12 +78,12 @@ module.exports = function(grunt) {
}, },
angular: { angular: {
src: [ src: [
'bower_components/fastclick/lib/fastclick.js',
'bower_components/qrcode-generator/js/qrcode.js', 'bower_components/qrcode-generator/js/qrcode.js',
'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js',
'bower_components/moment/min/moment-with-locales.js', 'bower_components/moment/min/moment-with-locales.js',
'bower_components/angular/angular.js', 'bower_components/angular/angular.js',
'bower_components/angular-ui-router/release/angular-ui-router.js', 'bower_components/angular-ui-router/release/angular-ui-router.js',
'bower_components/angular-local-storage/dist/angular-local-storage.js',
'bower_components/angular-foundation/mm-foundation.js', 'bower_components/angular-foundation/mm-foundation.js',
'bower_components/angular-foundation/mm-foundation-tpls.js', 'bower_components/angular-foundation/mm-foundation-tpls.js',
'bower_components/angular-animate/angular-animate.js', 'bower_components/angular-animate/angular-animate.js',

View file

@ -21,6 +21,7 @@
"angular-bitcore-wallet-client": "^0.0.18", "angular-bitcore-wallet-client": "^0.0.18",
"angular-ui-router": "~0.2.13", "angular-ui-router": "~0.2.13",
"qrcode-decoder-js": "*", "qrcode-decoder-js": "*",
"fastclick": "*",
"angular-ui-switch": "~0.1.0" "angular-ui-switch": "~0.1.0"
}, },
"resolutions": { "resolutions": {