refactoring, bugfix on socket service

public/js/app.js

@@ -2,7 +2,7 @@
 
 
 // Declare app level module which depends on filters, and services
-angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.directives']).
+var app = angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.directives']).
   config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
     $routeProvider.when('/view1', {templateUrl: 'partials/partial1', controller: MyCtrl1});
     $routeProvider.when('/view2', {templateUrl: 'partials/partial2', controller: MyCtrl2});

public/js/controllers.js

@@ -5,14 +5,12 @@
 function AppCtrl($scope, socket) {
   socket.on('send:name', function (data) {
     $scope.name = data.name;
-    $scope.$apply();
   });
 }
 
 function MyCtrl1($scope, socket) {
   socket.on('send:time', function (data) {
     $scope.time = data.time;
-    $scope.$apply();
   });
 }
 MyCtrl1.$inject = ['$scope', 'socket'];

public/js/services.js

@@ -7,7 +7,26 @@
 // In this case it is a simple value service.
 angular.module('myApp.services', []).
   value('version', '0.1').
-  factory('socket', function () {
+  factory('socket', function ($rootScope) {
     var socket = io.connect();
-    return socket;
+    return {
+      on: function (eventName, callback) {
+        socket.on(eventName, function () {  
+          var args = arguments;
+          $rootScope.$apply(function () {
+            callback.apply(socket, args);
+          });
+        });
+      },
+      emit: function (eventName, data, callback) {
+        socket.emit(eventName, data, function () {
+          var args = arguments;
+          $rootScope.$apply(function () {
+            if (callback) {
+              callback.apply(socket, args);
+            }
+          });
+        })
+      }
+    };
   });