aboutsummaryrefslogtreecommitdiffstats
path: root/alias-angular
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2012-04-14 20:15:40 -0400
committerGuillaume Horel <guillaume.horel@gmail.com>2012-04-14 20:15:40 -0400
commit667f6d688bdc4818feadde68c84ee690e150255a (patch)
treec36eb6eb79c0d9dc09f8d40f35ba0afc4c37b0a5 /alias-angular
parentbe91b58f33a5f3fb3f84392a5498f3188a3c7efa (diff)
downloadalias-667f6d688bdc4818feadde68c84ee690e150255a.tar.gz
some cleanups
Diffstat (limited to 'alias-angular')
-rw-r--r--alias-angular/app/index.html2
-rw-r--r--alias-angular/app/js/controllers.js4
-rwxr-xr-xalias-angular/scripts/web-server.js2
3 files changed, 3 insertions, 5 deletions
diff --git a/alias-angular/app/index.html b/alias-angular/app/index.html
index 7e78845..d3d1bf5 100644
--- a/alias-angular/app/index.html
+++ b/alias-angular/app/index.html
@@ -9,7 +9,7 @@
<form ng-submit="login()" ng-controller="ConnectCtl">
Username: <input type="text" ng-model="username"/>
Password: <input type="password" ng-model="password"/>
- <input type="submit" value="Login" ng-disabled="!username"/>
+ <input type="submit" value="Login" ng-disabled="!username || !password"/>
</form>
<div id="roster" ng-controller="RosterCtl">
diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js
index 2040e3a..d487fdf 100644
--- a/alias-angular/app/js/controllers.js
+++ b/alias-angular/app/js/controllers.js
@@ -32,13 +32,12 @@ function RosterCtl($scope, StropheSrv, $log) {
Strophe.forEachChild(query, 'item', function(item){
var jid = item.getAttribute('jid');
var name = item.getAttribute('name');
- $scope.contacts[jid]={name: name};
+ $scope.contacts[jid] = {name: name};
});
};
function onPresence(presence) {
var who = $(presence).attr('from');
var jid = Strophe.getBareJidFromJid(who);
- $log.log(jid);
var type = $(presence).attr('type');
if (type !== 'error') {
if (type === 'unavailable') {
@@ -58,7 +57,6 @@ function RosterCtl($scope, StropheSrv, $log) {
}
$scope.$on('connected', function() {
StropheSrv.addHandler(onPresence, 'presence');
- $log.log('test');
$scope.getRoster();
StropheSrv.send($pres());
});
diff --git a/alias-angular/scripts/web-server.js b/alias-angular/scripts/web-server.js
index 1ff37b3..1354fb8 100755
--- a/alias-angular/scripts/web-server.js
+++ b/alias-angular/scripts/web-server.js
@@ -1,6 +1,6 @@
#!/usr/bin/env node
-var sys = require('sys'),
+var sys = require('util'),
http = require('http'),
fs = require('fs'),
url = require('url'),