BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #179 from cmgustavo/ref/design-49 

Minor fixes. Fix Glidera
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-23 13:39:16 -03:00 committed by GitHub
parent a8568db32e fabf6a6fd1
commit 04c724f3dc
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/views/tab-send.html
View File

@ -10,8 +10,8 @@
<i class="icon ion-search placeholder-icon"></i> <i class="icon ion-search placeholder-icon"></i>
<input type="text" <input type="text"
placeholder="Search or enter bitcoin address" placeholder="Search or enter bitcoin address"
ng-model="search" ng-model="formData.search"
ng-change="findContact(search)" ng-change="findContact(formData.search)"
ng-model-onblur> ng-model-onblur>
</label> </label>
</div> </div>

5
src/js/controllers/buyGlidera.js
View File

@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
var self = this; var self = this;
this.show2faCodeInput = null; this.show2faCodeInput = null;
this.success = null; this.success = null;
$scope.network = glideraService.getEnvironment();
$scope.$on('Wallet/Changed', function(event, w) { $scope.$on('Wallet/Changed', function(event, w) {
if (lodash.isEmpty(w)) { if (lodash.isEmpty(w)) {
@ -116,9 +117,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
}; };
$scope.$on("$ionicView.enter", function(event, data){ $scope.$on("$ionicView.enter", function(event, data){
$scope.network = glideraService.getEnvironment(); $scope.token = null;
$scope.token = accessToken;
$scope.permissions = null; $scope.permissions = null;
$scope.email = null; $scope.email = null;
$scope.personalInfo = null; $scope.personalInfo = null;

6
src/js/controllers/glidera.js
View File

@ -3,13 +3,13 @@
angular.module('copayApp.controllers').controller('glideraController', angular.module('copayApp.controllers').controller('glideraController',
function($scope, $timeout, $ionicModal, $log, storageService, glideraService, ongoingProcess, platformInfo, externalLinkService, popupService, gettextCatalog) { function($scope, $timeout, $ionicModal, $log, storageService, glideraService, ongoingProcess, platformInfo, externalLinkService, popupService, gettextCatalog) {
$scope.network = glideraService.getEnvironment();
$scope.openExternalLink = function(url, target) { $scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target); externalLinkService.open(url, target);
}; };
var initGlidera = function(accessToken) { var initGlidera = function(accessToken) {
$scope.network = glideraService.getEnvironment();
$scope.token = null; $scope.token = null;
$scope.permissions = null; $scope.permissions = null;
$scope.email = null; $scope.email = null;
@ -113,7 +113,7 @@ angular.module('copayApp.controllers').controller('glideraController',
}); });
}; };
$scope.$on("$ionicView.enter", function(event, data){ $scope.$on("$ionicView.beforeEnter", function(event, data){
initGlidera(); initGlidera();
}); });

5
src/js/controllers/sellGlidera.js
View File

@ -8,6 +8,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
this.show2faCodeInput = null; this.show2faCodeInput = null;
this.success = null; this.success = null;
var wallet; var wallet;
$scope.network = glideraService.getEnvironment();
$scope.$on('Wallet/Changed', function(event, w) { $scope.$on('Wallet/Changed', function(event, w) {
if (lodash.isEmpty(w)) { if (lodash.isEmpty(w)) {
@ -189,9 +190,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
}; };
$scope.$on("$ionicView.enter", function(event, data){ $scope.$on("$ionicView.enter", function(event, data){
$scope.network = glideraService.getEnvironment(); $scope.token = null;
$scope.token = accessToken;
$scope.permissions = null; $scope.permissions = null;
$scope.email = null; $scope.email = null;
$scope.personalInfo = null; $scope.personalInfo = null;

1
src/js/controllers/tab-send.js
View File

@ -84,6 +84,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
}; };
$scope.$on("$ionicView.enter", function(event, data){ $scope.$on("$ionicView.enter", function(event, data){
$scope.formData = { search: null };
updateList(); updateList();
}); });