mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #179 from cmgustavo/ref/design-49
Minor fixes. Fix Glidera
This commit is contained in:
commit
04c724f3dc
|
@ -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>
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue