diff options
Diffstat (limited to 'alias-angular/app/js/controllers.js')
| -rw-r--r-- | alias-angular/app/js/controllers.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js index 732fcd3..1fca239 100644 --- a/alias-angular/app/js/controllers.js +++ b/alias-angular/app/js/controllers.js @@ -2,6 +2,7 @@ /* App Controllers */ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { + $rootScope.alias = {jid: "", status: 'offline' }; @@ -66,13 +67,12 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { privkey.dq, privkey.c); $rootScope.alias.rsa_key = rsa_key; }else{ - $scope.instructions = $(iq).find('instructions'); - $scope.form = form.xmppForm('render'); + $("#register .modal-body").append(form.xmppForm('render')); $("#register").modal("show"); } }; - function generate_key() { + $scope.generate_key = function() { var rsa_key = new RSAKey(); rsa_key.generate(1024, "10001"); var pubkey = { @@ -88,8 +88,8 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { c: rsa_key.coeff.toString(16) }; privkey = sjcl.encrypt($scope.password, JSON.stringify(privkey)); - $("#form-pubkey").val(JSON.stringify(pubkey)); - $("#form-privkey").val(privkey); + $("#form-pubkey","#register").val(JSON.stringify(pubkey)); + $("#form-privkey","#register").val(privkey); }; function send_registration() { |