Finally fixed the angular code!

1 files changed, 35 insertions, 8 deletions

diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js
index 7eb5cbd..5477e57 100644
--- a/alias-angular/app/js/controllers.js
+++ b/alias-angular/app/js/controllers.js
@@ -1,9 +1,34 @@
 'use strict';
 /* App Controllers */
 
-function RosterCtl($scope, connection, $log) {
+function ConnectCtl($scope, StropheSrv, $log, $rootScope) {
+    $scope.username = 'thrasibule@alias.im';
+    $scope.password = 'Jdiema;06';
+    $scope.connected = false;
+    function connect_callback(status){
+        if ( status == Strophe.Status.CONNECTING ) {
+            $log.log('Strophe is connecting.');
+        } else if ( status == Strophe.Status.CONNFAIL ) {
+            $log.log('Strophe failed to connect.');
+        } else if ( status == Strophe.Status.DISCONNECTING ) {
+            $log.log('Strophe is disconnecting.');
+        } else if ( status == Strophe.Status.DISCONNECTED ) {
+            $log.log('Strophe is disconnected.');
+        } else if ( status == Strophe.Status.CONNECTED ) {
+            $log.log('Strophe is connected.');
+            $rootScope.$broadcast('connected', true);
+        }
+    };
+    $scope.login = function () {
+        StropheSrv.login($scope.username, $scope.password, connect_callback);
+    };
+}
+
+ConnectCtl.$inject = ['$scope', 'StropheSrv', '$log', '$rootScope'];
+        
+function RosterCtl($scope, StropheSrv, $log) {
     $scope.contacts = [];
-    $scope.onRoster = function(iq) {
+    function onRoster(iq) {
         var elems = iq.getElementsByTagName('query');
         var query  = elems[0];
         Strophe.forEachChild(query, 'item', function(item){
@@ -11,10 +36,12 @@ function RosterCtl($scope, connection, $log) {
             var name = item.getAttribute('name') || jid;
             $scope.contacts.push(name);
         });
-        return true;
     };
-    $log.log('sending the stanza');
-    var query = $iq({type : 'get'}).c('query', {xmlns : Strophe.NS.ROSTER});
-    $scope.$on('connected',function () {$log('caught connected event');connection.sendIQ(query, $scope.onRoster);});
- };
-RosterCtl.$inject = ['$scope','connection','$log'];
\ No newline at end of file
+    $scope.$on('connected', function() {$scope.getRoster();});
+    $scope.getRoster = function () {
+        var query = $iq({type : 'get'}).c('query', {xmlns : Strophe.NS.ROSTER});
+        StropheSrv.sendIQ(query, onRoster);
+    };
+ }
+
+RosterCtl.$inject = ['$scope','StropheSrv','$log'];
\ No newline at end of file