From c19f0ea70c4335b675e37922fd00c5e71837e171 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 14 Jul 2016 18:55:46 -0300 Subject: [PATCH 1/3] Fix scrolling on iOS --- public/index.html | 8 ++++---- public/views/includes/sidebar.html | 4 ++-- src/js/controllers/index.js | 7 +------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/public/index.html b/public/index.html index 3f70a663a..4277f4235 100644 --- a/public/index.html +++ b/public/index.html @@ -1,4 +1,4 @@ - + @@ -19,13 +19,13 @@ - -
+ +
- +
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index eb90b3cea..4b67781da 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -23,14 +23,14 @@
Create, join or import
-
  • +
  • Buy and Sell
    • -
  • +
  • diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index d536eafb9..be1713459 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -70,12 +70,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; self.allowRefresher = function() { - if ($ionicSideMenuDelegate.getOpenRatio() != 0) { - self.allowPullToRefresh = false; - if (isCordova && platformInfo.isIOS) $ionicScrollDelegate.$getByHandle('my-handle').freezeScroll(true); - return; - } - if (isCordova && platformInfo.isIOS) $ionicScrollDelegate.$getByHandle('my-handle').freezeScroll(false); + if ($ionicSideMenuDelegate.getOpenRatio() != 0) self.allowPullToRefresh = false; } self.hideBalance = function() { From f2f405b6b308724d67510fa9f540bb32debb779c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 15 Jul 2016 01:27:45 -0300 Subject: [PATCH 2/3] Show keyboard accesory bar (ios) --- public/views/create.html | 6 +++--- src/js/routes.js | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index ef91c0977..b351d1784 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -8,10 +8,10 @@
    -
    +
    Personal Wallet
    -
    +
    Shared Wallet
    @@ -160,5 +160,5 @@
    -
    +
    diff --git a/src/js/routes.js b/src/js/routes.js index 61c774460..700eb99e4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -539,16 +539,17 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr window.addEventListener('native.keyboardhide', function() { $timeout(function() { $rootScope.shouldHideMenuBar = false; //show menu bar when keyboard is hidden with back button action on send screen - }, 300); + }, 100); }); window.addEventListener('native.keyboardshow', function() { - $rootScope.shouldHideMenuBar = true; //hide menu bar when keyboard opens with back button action on send screen - $rootScope.$digest(); + $timeout(function() { + $rootScope.shouldHideMenuBar = true; //hide menu bar when keyboard opens with back button action on send screen + }, 300); }); if (window.cordova.plugins.Keyboard) { - cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); + cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false); cordova.plugins.Keyboard.disableScroll(false); } From 11eed3e1a2f44dc268edee4a93caaed60e0f6346 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 15 Jul 2016 09:52:19 -0300 Subject: [PATCH 3/3] Removes unused variable --- public/views/walletHome.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index ae0d527a5..284fef3a3 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -35,11 +35,10 @@ -->
    -