From 826ea930b1f9a40bd11ea610256fea086914926b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Apr 2015 18:09:26 -0300 Subject: [PATCH 01/16] Renames of variables --- public/index.html | 4 ++-- src/js/controllers/index.js | 12 ++++++------ src/js/routes.js | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/public/index.html b/public/index.html index 99add2264..44897404c 100644 --- a/public/index.html +++ b/public/index.html @@ -31,8 +31,8 @@
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index f7199c1e9..0564f6c26 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -651,17 +651,17 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Animation/Disable', function(event) { $timeout(function() { - self.swipeLeft = false; - self.swipeRight = false; + self.slideLeft = false; + self.slideRight = false; }, 370); }); - $rootScope.$on('Animation/SwipeLeft', function(event) { - self.swipeLeft = true; + $rootScope.$on('Animation/SlideLeft', function(event) { + self.slideLeft = true; }); - $rootScope.$on('Animation/SwipeRight', function(event) { - self.swipeRight = true; + $rootScope.$on('Animation/SlideRight', function(event) { + self.slideRight = true; }); diff --git a/src/js/routes.js b/src/js/routes.js index 188ad0e57..720c84ebf 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -506,7 +506,7 @@ angular receive: 0, send: 0, history: 0, - preferences: 0, + preferences: 11, preferencesColor: 12, backup: 12, preferencesAdvanced: 12, @@ -531,9 +531,9 @@ angular $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { if (pageWeight[fromState.name] > pageWeight[toState.name]) { - $rootScope.$emit('Animation/SwipeRight'); + $rootScope.$emit('Animation/SlideRight'); } else if (pageWeight[fromState.name] < pageWeight[toState.name]) { - $rootScope.$emit('Animation/SwipeLeft'); + $rootScope.$emit('Animation/SlideLeft'); } if (!profileService.profile && toState.needProfile) { From e24628d77587f5c83974e2b866e5dd75c2b7222d Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 4 May 2015 19:23:18 -0300 Subject: [PATCH 02/16] New slide up/down for different states --- Gruntfile.js | 1 - public/index.html | 11 ++- public/views/modals/txp-details.html | 2 +- src/css/mobile.css | 103 +++++++++++++++++---------- src/js/controllers/index.js | 11 ++- src/js/controllers/walletHome.js | 4 +- src/js/routes.js | 17 ++++- 7 files changed, 100 insertions(+), 49 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3a72574f9..f9c8d3199 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -84,7 +84,6 @@ module.exports = function(grunt) { 'bower_components/moment/min/moment-with-locales.js', 'bower_components/angular/angular.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', - 'bower_components/angular-foundation/mm-foundation.js', 'bower_components/angular-foundation/mm-foundation-tpls.js', 'bower_components/angular-animate/angular-animate.js', 'bower_components/angular-moment/angular-moment.js', diff --git a/public/index.html b/public/index.html index 44897404c..142969ec2 100644 --- a/public/index.html +++ b/public/index.html @@ -31,8 +31,15 @@
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 61f6a9ad2..a2cd28405 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -1,6 +1,6 @@