This commit is contained in:
Gabriel Bazán 2016-02-15 11:49:08 -03:00
parent 58ba939f89
commit 2813216a66
4 changed files with 23 additions and 8 deletions

View File

@ -195,15 +195,12 @@
</div>
</div>
<div id="searchLabel" class="left-inner-addon ">
<div class="left-inner-addon ">
<i class="fi-magnifying-glass"></i>
<input name="search"
ng-click="home.searchInput()"
ng-focus="home.formFocus('search')"
ng-blur="home.formFocus(false)"
type="text"
placeholder="{{'Amount, address, mm/dd/yyyy' | translate}}"
ng-model="search"></input>
<input type="text"
class="form-control"
placeholder="Amount, address, mm/dd/yyyy"
ng-model="search"></input>
</div>
<div ng-repeat="btx in index.filter(search) track by btx.txid"
fast-click callback-fn="home.openTxModal(btx)"

View File

@ -796,6 +796,11 @@ table tbody tr:last-child td {
padding: 5px;
padding-left: 20px;
}
.left-inner-addon a {
position: absolute;
padding: 5px;
right: 0px;
}
/*//////////////////////////// BUTTON OUTLINE ////////////////////////////*/

View File

@ -916,6 +916,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}, 100);
};
self.hideHistory = function() {
if (!self.historyShowShowAll) {
self.txHistory = self.txHistory.slice(0, 10);
self.historyShowShowAll = true;
}
};
self.filter = function(search) {
function formatDate(date) {
@ -1192,6 +1199,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setAddressbook(ab);
});
$rootScope.$on('Local/Searching', function(event, val) {
if (val) self.showAllHistory();
else self.hideHistory();
});
// UX event handlers
$rootScope.$on('Local/ColorUpdated', function(event) {
self.updateColor();

View File

@ -24,6 +24,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
ret.isMobile = isMobile.any();
ret.isWindowsPhoneApp = isMobile.Windows() && isCordova;
var vanillaScope = ret;
this.isSearching = false;
var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) {
self.setForm(data);