yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-06 03:50:04 +02:00
Code Issues Releases Wiki Activity

Shortcut {modules,services} to app.

Browse source
This commit is contained in:
Simo Kinnunen 2014-02-06 15:11:26 +09:00
parent 06fd5bc722
commit a2dd5ad0c7
7 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/app/scripts/controllers/DeviceControlCtrl.js
View file

@ -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'

4
res/app/scripts/controllers/DeviceListCtrl.js
View file

@ -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'

4
res/app/scripts/services/ControlService.js
View file

@ -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

4
res/app/scripts/services/DeviceService.js
View file

@ -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'

4
res/app/scripts/services/GroupService.js
View file

@ -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'

4
res/app/scripts/services/SocketService.js
View file

@ -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])
})

4
res/app/scripts/services/UserService.js
View file

@ -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])
})