anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4303 from gabrielbazan7/fix/SelectText

Browse source 
fix - select text on all screens
This commit is contained in:
Matias Alejo Garcia 2016-06-08 11:32:21 -03:00
commit bfb23afa53
8 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/index.html
View file

@ -25,7 +25,7 @@
<!-- Main content -->
<ion-side-menu-content on-drag="index.onDrag()">
<ion-side-menu-content drag-content="index.isCordova">
<div notifications="right top"></div>
<div id="sectionContainer">
<div id="mainSection">

4
public/views/modals/addressbook.html
View file

@ -1,6 +1,6 @@
<ion-modal-view ng-controller="addressbookController as addressbookC">
<div ng-init="wallets[0] ? selectedWalletsOpt = true : selectedWalletsOpt = false; checkClipboard()">
<ion-content ng-style="{'background-color': '#f6f7f9'}">
<ion-content ng-style="{'background-color': '#f6f7f9'}" overflow-scroll="true">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancel()" class="p10">
@ -132,4 +132,4 @@
</div>
</ion-content>
</div>
</ion-modal-view>
</ion-modal-view>

2
public/views/modals/customized-amount.html
View file

@ -1,5 +1,5 @@
<ion-modal-view ng-controller="customAmountController">
<ion-content>
<ion-content overflow-scroll="true">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<a ng-click="cancel()" class="p10">

2
public/views/modals/paypro.html
View file

@ -11,7 +11,7 @@
</section>
</nav>
<ion-content ng-style="{'background-color': '#F6F7F9'}">
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
<div class="modal-content">
<div class="header-modal text-center p50t">
<div class="size-42">

2
public/views/modals/search.html
View file

@ -1,5 +1,5 @@
<ion-modal-view ng-controller="searchController">
<ion-content>
<ion-content overflow-scroll="true">
<nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small">
<a ng-click="cancel(); index.cancelSearch()" class="p10">

2
public/views/modals/tx-details.html
View file

@ -10,7 +10,7 @@
</section>
</nav>
<ion-content ng-style="{'background-color': '#F6F7F9'}">
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
<div class="modal-content">
<div class="header-modal text-center" ng-init="getAlternativeAmount(btx)">
<div ng-show="btx.action != 'invalid'">

2
public/views/modals/txp-details.html
View file

@ -18,7 +18,7 @@
</div>
</div>
<ion-content ng-style="{'background-color': '#F6F7F9'}">
<ion-content ng-style="{'background-color': '#F6F7F9'}" overflow-scroll="true">
<div class="modal-content fix-modals-touch" ng-init="updateCopayerList()">
<div class="payment-proposal-head" ng-style="{'background-color':color}">
<div class="size-36">{{tx.amountStr}}</div>

7
src/js/controllers/index.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicSideMenuDelegate, $ionicScrollDelegate, $ionicPopup, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService) {
angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService) {
var self = this;
var SOFT_CONFIRMATION_LIMIT = 12;
var errors = bwcService.getErrors();
@ -69,11 +69,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
go.walletHome();
};
self.onDrag = function() {
if (!isCordova)
$ionicSideMenuDelegate.canDragContent(false);
};
self.hideBalance = function() {
storageService.getHideBalanceFlag(self.walletId, function(err, shouldHideBalance) {
if (err) self.shouldHideBalance = false;