Il parait que les dépendances ça sert à rien alors...

Geoffrey PREUD'HOMME
1 parent 7cf406d0
Showing 10 changed files with 83 additions and 92 deletions Show diff stats
public/js/app.js
public/js/controllers/ConnectCtrl.js
public/js/controllers/ForumConvCtrl.js
public/js/controllers/ForumDirCtrl.js
public/js/controllers/MembreCtrl.js
public/js/controllers/SessionCtrl.js
public/js/services/ApiServ.js
public/js/services/EncryptServ.js
public/js/services/NotifyServ.js
public/js/services/SessionServ.js
-angular.module('ciApp', ['ngAnimate', 'ngRoute', 'ConnectCtrl', 'MembreCtrl', 'ForumDirCtrl', 'ForumConvCtrl', 'SessionsCtrl']).config(['$routeProvider', '$locationProvider',
-    function ($routeProvider, $locationProvider) {
-        $routeProvider
-            .when('/', {
-                templateUrl: 'views/home.html'
-            })
-            .when('/membres', {
-                templateUrl: 'views/membres.html',
-                controller: 'MembreCtrl'
-            })
-            .when('/forum', {
-                redirectTo: 'forum/dir/0'
-            })
-            .when('/forum/dir/:dir_id', {
-                templateUrl: 'views/forumDir.html',
-                controller: 'ForumDirCtrl'
-            })
-            .when('/forum/conv/:conv_id', {
-                templateUrl: 'views/forumConv.html',
-                controller: 'ForumConvCtrl'
-            })
-            .when('/connect', {
-                templateUrl: 'views/connect.html',
-                controller: 'ConnectCtrl'
-            })
-            .otherwise({
-                redirectTo: '/'
-            });
-        $locationProvider.html5Mode(true);
-    }
-]);
+angular.module('ciApp', ['ngAnimate', 'ngRoute', 'ConnectCtrl', 'MembreCtrl', 'ForumDirCtrl', 'ForumConvCtrl', 'SessionsCtrl']).config(function ($routeProvider, $locationProvider) {
+    $routeProvider
+        .when('/', {
+            templateUrl: 'views/home.html'
+        })
+        .when('/membres', {
+            templateUrl: 'views/membres.html',
+            controller: 'MembreCtrl'
+        })
+        .when('/forum', {
+            redirectTo: 'forum/dir/0'
+        })
+        .when('/forum/dir/:dir_id', {
+            templateUrl: 'views/forumDir.html',
+            controller: 'ForumDirCtrl'
+        })
+        .when('/forum/conv/:conv_id', {
+            templateUrl: 'views/forumConv.html',
+            controller: 'ForumConvCtrl'
+        })
+        .when('/connect', {
+            templateUrl: 'views/connect.html',
+            controller: 'ConnectCtrl'
+        })
+        .otherwise({
+            redirectTo: '/'
+        });
+    $locationProvider.html5Mode(true);
+});
-angular.module('ConnectCtrl', ['SessionsServ', 'EncryptServ', 'angular-ladda']).controller('ConnectCtrl', ['$scope', 'SessionServ', 'EncryptServ',
-    function ($scope, SessionServ, EncryptServ) {
+angular.module('ConnectCtrl', ['SessionsServ', 'EncryptServ', 'angular-ladda'])
+    .controller('ConnectCtrl', function ($scope, SessionServ, EncryptServ) {
         EncryptServ.preload(function () {
             return undefined;
         });
@@ -15,5 +15,4 @@ angular.module(&#39;ConnectCtrl&#39;, [&#39;SessionsServ&#39;, &#39;EncryptServ&#39;, &#39;angular-ladda&#39;]).
                 });
             }
         };
-    }
-]);
+    });
-angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ']).controller('ForumConvCtrl', ['$scope', '$routeParams', 'SessionServ', 'ApiServ',
-    function ($scope, $routeParams, SessionServ, ApiServ) {
+angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ'])
+    .controller('ForumConvCtrl', function ($scope, $routeParams, SessionServ, ApiServ) {
         $scope.messs = [];
         $scope.conv = {};
         $scope.formData = {};
@@ -35,5 +35,4 @@ angular.module(&#39;ForumConvCtrl&#39;, [&#39;SessionsServ&#39;, &#39;ApiServ&#39;]).controller(&#39;ForumCo
             });
         };
-    }
-]);
+    });
-angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ']).controller('ForumDirCtrl', ['$scope', 'SessionServ', 'ApiServ', function ($scope, SessionServ, ApiServ) {
-    $scope.convs = [];
-    $scope.formData = {};
+angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ'])
+    .controller('ForumDirCtrl', function ($scope, SessionServ, ApiServ) {
+        $scope.convs = [];
+        $scope.formData = {};
-    $scope.session = SessionServ.cur;
-    SessionServ.onChange(function () {
         $scope.session = SessionServ.cur;
-    });
-
-    ApiServ("récupération des conversations", 'get', 'convs', function (err, convs) {
-        if (!err)
-            $scope.convs = convs;
-    });
-
-    $scope.createConv = function () {
-        ApiServ("création de la conversation", 'post', 'convs', $scope.formData, function (err, conv) {
-            if (!err) {
-                $scope.formData = {};
-                $scope.convs.push(conv);
-            }
+        SessionServ.onChange(function () {
+            $scope.session = SessionServ.cur;
         });
-    };
-    $scope.deleteConv = function (index) {
-        ApiServ("création de la conversation", 'delete', 'convs', $scope.convs[index]._id, function (err) {
+        ApiServ("récupération des conversations", 'get', 'convs', function (err, convs) {
             if (!err)
-                $scope.convs.splice(index, 1);
+                $scope.convs = convs;
         });
-    };
-}]);
+        $scope.createConv = function () {
+            ApiServ("création de la conversation", 'post', 'convs', $scope.formData, function (err, conv) {
+                if (!err) {
+                    $scope.formData = {};
+                    $scope.convs.push(conv);
+                }
+            });
+        };
+
+        $scope.deleteConv = function (index) {
+            ApiServ("création de la conversation", 'delete', 'convs', $scope.convs[index]._id, function (err) {
+                if (!err)
+                    $scope.convs.splice(index, 1);
+            });
+        };
+
+    });
-angular.module('MembreCtrl', ['SessionsServ', 'ApiServ']).controller('MembreCtrl', ['$scope', '$http', 'SessionServ', 'ApiServ',
-    function ($scope, $http, SessionServ, ApiServ) {
+angular.module('MembreCtrl', ['SessionsServ', 'ApiServ'])
+    .controller('MembreCtrl', function ($scope, SessionServ, ApiServ) {
         $scope.formData = {};
         $scope.session = SessionServ.cur;
@@ -28,5 +28,4 @@ angular.module(&#39;MembreCtrl&#39;, [&#39;SessionsServ&#39;, &#39;ApiServ&#39;]).controller(&#39;MembreCtrl
                 }
             });
         };
-    }
-]);
+    });
-angular.module('SessionsCtrl', ['SessionsServ']).controller('SessionCtrl', ['$scope', 'SessionServ',
-    function ($scope, SessionServ) {
+angular.module('SessionsCtrl', ['SessionsServ'])
+    .controller('SessionCtrl', function ($scope, SessionServ) {
         $scope.isCollapsed = false;
         $scope.session = SessionServ.cur;
         $scope.disconnect = function () {
             SessionServ.disconnect();
         };
         SessionServ.onChange(function () {
-                $scope.session = SessionServ.cur;
-            });
-            // $scope.$on("$destroy", function () {
-            //     // TODO
-            // })
-    }
-]);
+            $scope.session = SessionServ.cur;
+        });
+        // $scope.$on("$destroy", function () {
+        //     // TODO
+        // })
+    });
-angular.module('ApiServ', ['NotifyServ']).service('ApiServ', ['$http', 'NotifyServ',
-    function ($http, NotifyServ) {
+angular.module('ApiServ', ['NotifyServ'])
+    .service('ApiServ', function ($http, NotifyServ) {
         return function (name, method, href) {
             link = '/api/' + href;
             arglen = arguments.length;
@@ -30,5 +30,4 @@ angular.module(&#39;ApiServ&#39;, [&#39;NotifyServ&#39;]).service(&#39;ApiServ&#39;, [&#39;$http&#39;, &#39;NotifySe
                     // console.error(name, status, data);
                 });
         };
-    }
-]);
+    });
-angular.module('EncryptServ', []).service('EncryptServ', ['$http',
-    function ($http) {
+angular.module('EncryptServ', [])
+    .service('EncryptServ', function ($http) {
         a = {
             encrypter: false,
             whenOk: function (cb) {
@@ -26,5 +26,4 @@ angular.module(&#39;EncryptServ&#39;, []).service(&#39;EncryptServ&#39;, [&#39;$http&#39;,
             }
         };
         return a;
-    }
-]);
+    });
-angular.module('NotifyServ', []).service('NotifyServ', [
-    function () {
+angular.module('NotifyServ', [])
+    .service('NotifyServ', function () {
         $.notifyDefaults({
             placement: {
                 from: 'bottom',
@@ -97,5 +97,4 @@ angular.module(&#39;NotifyServ&#39;, []).service(&#39;NotifyServ&#39;, [
                 };
             }
         };
-    }
-]);
+    });
-angular.module('SessionsServ', ['NotifyServ', 'EncryptServ']).service('SessionServ', ['$http', 'EncryptServ', 'NotifyServ',
-    function ($http, EncryptServ, NotifyServ) {
+angular.module('SessionsServ', ['NotifyServ', 'EncryptServ'])
+    .service('SessionServ', function ($http, EncryptServ, NotifyServ) {
         a = {
             cur: false,
             changeHandlers: [],
@@ -74,5 +74,4 @@ angular.module(&#39;SessionsServ&#39;, [&#39;NotifyServ&#39;, &#39;EncryptServ&#39;]).service(&#39;SessionSe
         };
         a.get();
         return a;
-    }
-]);
+    });