Revert "rm fastclick"

This reverts commit ea7484512f.

Conflicts:
	src/js/controllers/index.js
This commit is contained in:
Matias Alejo Garcia 2015-04-23 17:45:32 -03:00
commit 3c00a4a06c
4 changed files with 5 additions and 4 deletions

View file

@ -78,6 +78,7 @@ 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',

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": {

View file

@ -1,7 +1,8 @@
<div <div
class="bottom-bar row collapse"> class="bottom-bar row collapse">
<div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu"> <div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu">
<a id="menu-{{item.link}}" ng-click="index.setTab(item.link)" class="{{item.active? 'active': ''}}" style="border-top-color:{{item.active? index.backgroundColor: ''}}" > <a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}"
ng-style="{'border-top-color':index.tab==item.link ? index.backgroundColor : ''}">
<i class="size-36 {{item.icon}} db"></i> <i class="size-36 {{item.icon}} db"></i>
<div class="size-10 tu"> <div class="size-10 tu">
{{item.title|translate}} {{item.title|translate}}

View file

@ -13,8 +13,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.menu = [{ self.menu = [{
'title': 'Home', 'title': 'Home',
'icon': 'icon-home', 'icon': 'icon-home',
'link': 'walletHome', 'link': 'walletHome'
'active': true,
}, { }, {
'title': 'Receive', 'title': 'Receive',
'icon': 'icon-receive', 'icon': 'icon-receive',
@ -104,7 +103,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}; };
self.setTab = function(tab) { self.setTab = function(tab) {
if (self.tab === tab) if (self.tab === tab)
return; return;