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.js22
-rw-r--r--alias-angular/app/js/filters.js2
2 files changed, 20 insertions, 4 deletions
diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js
index 1eb53e7..8768915 100644
--- a/alias-angular/app/js/controllers.js
+++ b/alias-angular/app/js/controllers.js
@@ -36,7 +36,7 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) {
ConnectCtl.$inject = ['$scope', 'StropheSrv', '$log', '$rootScope'];
-function RosterCtl($scope, StropheSrv, $log) {
+function RosterCtl($scope, StropheSrv, $log, $rootScope) {
$scope.contacts = {};
$scope.get_contacts = function() {
return _.toArray($scope.contacts);
@@ -82,10 +82,26 @@ function RosterCtl($scope, StropheSrv, $log) {
$scope.getRoster();
});
- $scope.getRoster = function () {
+ $scope.getRoster = function() {
var query = $iq({type : 'get'}).c('query', {xmlns : Strophe.NS.ROSTER});
StropheSrv.sendIQ(query, onRoster);
};
+
+ $scope.chatWith = function(contact) {
+ $rootScope.$broadcast('msgrequest', {jid: contact.jid, name:contact.name});
+ };
}
-RosterCtl.$inject = ['$scope','StropheSrv','$log'];
+RosterCtl.$inject = ['$scope','StropheSrv','$log', '$rootScope'];
+
+function MsgCtl($scope, $log) {
+ $scope.conversations = [];
+ $scope.$on('msgrequest', function(event, contact){
+ $log.log(contact);
+ if (_.indexOf($scope.conversations, contact)) {
+ $scope.conversations.push(contact);
+ }
+ });
+}
+
+MsgCtl.$inject = ['$scope','$log']; \ No newline at end of file
diff --git a/alias-angular/app/js/filters.js b/alias-angular/app/js/filters.js
index 6b77998..772e523 100644
--- a/alias-angular/app/js/filters.js
+++ b/alias-angular/app/js/filters.js
@@ -15,7 +15,7 @@ angular.module('Alias.filters', []).
});
}
};
- }).filter('hideoffline', function() {
+ }).filter('showoffline', function() {
return function(contacts, checkoffline) {
if(checkoffline) {
return contacts;