diff options
Diffstat (limited to 'alias-angular')
| -rw-r--r-- | alias-angular/app/index.html | 9 | ||||
| -rw-r--r-- | alias-angular/app/js/controllers.js | 21 | ||||
| -rw-r--r-- | alias-angular/app/js/services.js | 4 |
3 files changed, 19 insertions, 15 deletions
diff --git a/alias-angular/app/index.html b/alias-angular/app/index.html index 5437815..e95a337 100644 --- a/alias-angular/app/index.html +++ b/alias-angular/app/index.html @@ -18,8 +18,8 @@ <div class="modal-body"> </div> <div class="modal-footer"> - <a href="#" class="btn" ng-Click="generate_key()">Generate</a> - <a href="#" class="btn">Register</a> + <a href="#" class="btn" ng-click="generate_key()">Generate</a> + <a href="#" class="btn" ng-click="send_registration()">Register</a> </div> </div> <form class="form-inline" ng-submit="login()" ng-hide="is_connected()"> @@ -94,11 +94,12 @@ <script src="js/controllers.js"></script> <script src="js/filters.js"></script> <script src="js/directives.js"></script> - <script src="lib/jsbn.js"></scrtipt> + <script src="lib/jsbn.js"></script> <script src="lib/jsbn2.js"></script> - <script src="lib/rng.js"></script> <script src="lib/prng4.js"></script> + <script src="lib/rng.js"></script> <script src="lib/rsa.js"></script> <script src="lib/rsa2.js"></script> + <script src="lib/sjcl.js"></script> </body> </html> diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js index 1fca239..144bd8b 100644 --- a/alias-angular/app/js/controllers.js +++ b/alias-angular/app/js/controllers.js @@ -52,11 +52,11 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { }; function onRegister(iq) { - var form = $(iq).find('query x'); + $scope.form = $(iq).find('query x'); if ($(iq).find('registered').length !== 0){ // user is registered, get the info from the form - var pubkey = form.find('field[var="pubkey"] > value').text(); - var privkey = form.find('field[var="privkey"] > value').text(); + var pubkey = $scope.form.find('field[var="pubkey"] > value').text(); + var privkey = $scope.form.find('field[var="privkey"] > value').text(); privkey = sjcl.decrypt($scope.password, privkey); pubkey = JSON.parse(pubkey); privkey = JSON.parse(privkey); @@ -67,7 +67,7 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { privkey.dq, privkey.c); $rootScope.alias.rsa_key = rsa_key; }else{ - $("#register .modal-body").append(form.xmppForm('render')); + $("#register .modal-body").append($scope.form.xmppForm('render')); $("#register").modal("show"); } }; @@ -75,6 +75,7 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { $scope.generate_key = function() { var rsa_key = new RSAKey(); rsa_key.generate(1024, "10001"); + $rootScope.alias.rsa_key = rsa_key; var pubkey = { n: rsa_key.n.toString(16), e: rsa_key.e.toString(16) @@ -92,17 +93,17 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { $("#form-privkey","#register").val(privkey); }; - function send_registration() { + $scope.send_registration = function() { var pubkey = $('<value></value').text($("#form-pubkey").val()); var privkey = $('<value></value').text($("#form-privkey").val()); - form.find('field[var="privkey"]').append(privkey); - form.find('field[var="pubkey"]').append(pubkey); - form.attr('type', 'submit'); + $scope.form.find('field[var="privkey"]').append(privkey); + $scope.form.find('field[var="pubkey"]').append(pubkey); + $scope.form.attr('type', 'submit'); var reg = $iq({to: server_component, type:'set'}); reg.c('query',{xmlns:'jabber:iq:register'}); - reg.cnode(form.get(0)); + reg.cnode($scope.form.get(0)); StropheSrv.sendIQ(reg); - $("#register").modal("show"); + $("#register").modal("hide"); }; } diff --git a/alias-angular/app/js/services.js b/alias-angular/app/js/services.js index 0393487..1040615 100644 --- a/alias-angular/app/js/services.js +++ b/alias-angular/app/js/services.js @@ -10,7 +10,9 @@ angular.module('Alias.services', [], function($provide) { }, sendIQ: function(query, callback) { connection.sendIQ(query, function (data) { - $rootScope.$apply(callback(data)); + if (callback) { + $rootScope.$apply(callback(data)); + } }); }, addHandler: function(callback, name, type) { |