aboutsummaryrefslogtreecommitdiffstats
path: root/alias-angular/app/js
diff options
context:
space:
mode:
Diffstat (limited to 'alias-angular/app/js')
-rw-r--r--alias-angular/app/js/controllers.js3
-rw-r--r--alias-angular/app/js/services.js15
2 files changed, 8 insertions, 10 deletions
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