From a2dd5ad0c7edc705b8c4fb9ced2c333e3b389f62 Mon Sep 17 00:00:00 2001
From: Simo Kinnunen <simo@shoqolate.com>
Date: Thu, 6 Feb 2014 15:11:26 +0900
Subject: [PATCH] Shortcut {modules,services} to app.

---
 res/app/scripts/controllers/DeviceControlCtrl.js | 4 ++--
 res/app/scripts/controllers/DeviceListCtrl.js    | 4 ++--
 res/app/scripts/services/ControlService.js       | 4 ++--
 res/app/scripts/services/DeviceService.js        | 4 ++--
 res/app/scripts/services/GroupService.js         | 4 ++--
 res/app/scripts/services/SocketService.js        | 4 ++--
 res/app/scripts/services/UserService.js          | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/res/app/scripts/controllers/DeviceControlCtrl.js b/res/app/scripts/controllers/DeviceControlCtrl.js
index 3d3278d5..22f6f679 100644
--- a/res/app/scripts/controllers/DeviceControlCtrl.js
+++ b/res/app/scripts/controllers/DeviceControlCtrl.js
@@ -1,4 +1,4 @@
-define(['./_module'], function(controllers) {
+define(['./_module'], function(app) {
   function DeviceControlCtrl($scope, $routeParams, deviceService, controlService) {
     $scope.device = null
     $scope.control = null
@@ -10,7 +10,7 @@ define(['./_module'], function(controllers) {
       })
   }
 
-  controllers.controller('DeviceControlCtrl'
+  app.controller('DeviceControlCtrl'
   , [ '$scope'
     , '$routeParams'
     , 'DeviceService'
diff --git a/res/app/scripts/controllers/DeviceListCtrl.js b/res/app/scripts/controllers/DeviceListCtrl.js
index 819e0b70..7b9adb0d 100644
--- a/res/app/scripts/controllers/DeviceListCtrl.js
+++ b/res/app/scripts/controllers/DeviceListCtrl.js
@@ -1,4 +1,4 @@
-define(['./_module'], function(controllers) {
+define(['./_module'], function(app) {
   function DeviceListCtrl($scope, deviceService, groupService) {
     $scope.devices = deviceService.devices
 
@@ -21,7 +21,7 @@ define(['./_module'], function(controllers) {
     }
   }
 
-  controllers.controller('DeviceListCtrl'
+  app.controller('DeviceListCtrl'
   , [ '$scope'
     , 'DeviceService'
     , 'GroupService'
diff --git a/res/app/scripts/services/ControlService.js b/res/app/scripts/services/ControlService.js
index 441107ac..a74f4247 100644
--- a/res/app/scripts/services/ControlService.js
+++ b/res/app/scripts/services/ControlService.js
@@ -1,4 +1,4 @@
-define(['./_module', 'lodash'], function(services, _) {
+define(['./_module', 'lodash'], function(app, _) {
   function ControlServiceFactory($rootScope, socket) {
     var controlService = {
     }
@@ -56,7 +56,7 @@ define(['./_module', 'lodash'], function(services, _) {
     return controlService
   }
 
-  services.factory('ControlService'
+  app.factory('ControlService'
   , [ '$rootScope'
     , 'SocketService'
     , ControlServiceFactory
diff --git a/res/app/scripts/services/DeviceService.js b/res/app/scripts/services/DeviceService.js
index 55111bb5..cd3c5c34 100644
--- a/res/app/scripts/services/DeviceService.js
+++ b/res/app/scripts/services/DeviceService.js
@@ -1,4 +1,4 @@
-define(['./_module', 'oboe'], function(services, oboe) {
+define(['./_module', 'oboe'], function(app, oboe) {
   function DeviceServiceFactory($rootScope, $http, socket) {
     var deviceService = {
       devices: []
@@ -77,7 +77,7 @@ define(['./_module', 'oboe'], function(services, oboe) {
     return deviceService
   }
 
-  services.factory('DeviceService'
+  app.factory('DeviceService'
   , [ '$rootScope'
     , '$http'
     , 'SocketService'
diff --git a/res/app/scripts/services/GroupService.js b/res/app/scripts/services/GroupService.js
index febd904d..81c24ed1 100644
--- a/res/app/scripts/services/GroupService.js
+++ b/res/app/scripts/services/GroupService.js
@@ -1,4 +1,4 @@
-define(['./_module', 'lodash'], function(services, _) {
+define(['./_module', 'lodash'], function(app, _) {
   function GroupServiceFactory($rootScope, socket, userService) {
     var groupService = {
       members: []
@@ -46,7 +46,7 @@ define(['./_module', 'lodash'], function(services, _) {
     return groupService
   }
 
-  services.factory('GroupService'
+  app.factory('GroupService'
   , [ '$rootScope'
     , 'SocketService'
     , 'UserService'
diff --git a/res/app/scripts/services/SocketService.js b/res/app/scripts/services/SocketService.js
index a36ad6a5..fb17fce1 100644
--- a/res/app/scripts/services/SocketService.js
+++ b/res/app/scripts/services/SocketService.js
@@ -1,8 +1,8 @@
-define(['./_module', 'socket.io'], function(services, io) {
+define(['./_module', 'socket.io'], function(app, io) {
   function SocketServiceFactory() {
     var socketService = io.connect()
     return socketService
   }
 
-  services.factory('SocketService', [SocketServiceFactory])
+  app.factory('SocketService', [SocketServiceFactory])
 })
diff --git a/res/app/scripts/services/UserService.js b/res/app/scripts/services/UserService.js
index 6192463e..7ad9c9e4 100644
--- a/res/app/scripts/services/UserService.js
+++ b/res/app/scripts/services/UserService.js
@@ -1,4 +1,4 @@
-define(['./_module'], function(services) {
+define(['./_module'], function(app) {
   function UserServiceFactory($http) {
     var userService = {
     }
@@ -13,5 +13,5 @@ define(['./_module'], function(services) {
     return userService
   }
 
-  services.factory('UserService', ['$http', UserServiceFactory])
+  app.factory('UserService', ['$http', UserServiceFactory])
 })