diff options
| author | Guillaume Horel <guillaume.horel@gmail.com> | 2012-04-06 21:46:12 -0400 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2012-04-06 21:46:12 -0400 |
| commit | 05f8a92e9f90f58a637501b38de7b4c8b6b60619 (patch) | |
| tree | 4760272f97197d16fd4ed70e5c5a77d5084d296f | |
| parent | 383eb29ea70f8c26bf97b2ba8f56645623048105 (diff) | |
| download | alias-05f8a92e9f90f58a637501b38de7b4c8b6b60619.tar.gz | |
fixed the input form and code cleanups
| -rw-r--r-- | alias-angular/app/index.html | 6 | ||||
| -rw-r--r-- | alias-angular/app/js/controllers.js | 3 | ||||
| -rw-r--r-- | alias-angular/app/js/services.js | 15 |
3 files changed, 10 insertions, 14 deletions
diff --git a/alias-angular/app/index.html b/alias-angular/app/index.html index f6f1e4f..709f59f 100644 --- a/alias-angular/app/index.html +++ b/alias-angular/app/index.html @@ -6,12 +6,10 @@ <link rel="stylesheet" href="css/app.css"/> </head> <body> - <!-- var query = $iq({type : 'get'}).c('query', {xmlns : Strophe.NS.ROSTER}); --> - <!-- connection.sendIQ(query, $scope.onRoster); --> <form ng-submit="login()" ng-controller="ConnectCtl"> Username: <input type="text" ng-model="username"/> - Password: <input type="text" ng-model="password"/> - <input type="submit" value="Login"/> <!-- disabled="{{username=='' || password==''}}"> --> + Password: <input type="password" ng-model="password"/> + <input type="submit" value="Login" ng-disabled="!username"/> </form> <div ng-controller="RosterCtl"> diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js index b6b2210..0548675 100644 --- a/alias-angular/app/js/controllers.js +++ b/alias-angular/app/js/controllers.js @@ -4,7 +4,6 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) { $scope.username = ''; $scope.password = ''; - $scope.connected = false; function connect_callback(status){ if ( status == Strophe.Status.CONNECTING ) { $log.log('Strophe is connecting.'); @@ -44,4 +43,4 @@ function RosterCtl($scope, StropheSrv, $log) { }; } -RosterCtl.$inject = ['$scope','StropheSrv','$log']; +RosterCtl.$inject = ['$scope','StropheSrv','$log'];
\ No newline at end of file diff --git a/alias-angular/app/js/services.js b/alias-angular/app/js/services.js index 7b9e285..98bff5e 100644 --- a/alias-angular/app/js/services.js +++ b/alias-angular/app/js/services.js @@ -4,13 +4,12 @@ angular.module('Alias.services', [], function($provide) { $provide.factory('StropheSrv', ['$log', '$rootScope', function($log, $rootScope) { var connection = new Strophe.Connection(BOSH_SERVICE); - this.login = function(name, password, connect_callback) { - connection.connect(name, password, function(status){ $rootScope.$apply(connect_callback(status));}); - }; - this.sendIQ = function(query, callback) { - connection.sendIQ(query, function(data){ - $rootScope.$apply(callback(data));}); - }; - return this; + return {login: function(name, password, connect_callback) { + connection.connect(name, password, connect_callback); + }, + sendIQ: function(query, callback) { + connection.sendIQ(query, function(data){ + $rootScope.$apply(callback(data));}); + }}; }]); });
\ No newline at end of file |