Merge commit 'refs/pull/3590/head' of github.com:domoticz/domoticz into development

Author: gizmocuz

www/app/DashboardController.js

@@ -1,5 +1,5 @@
-define(['app'], function (app) {
-	app.controller('DashboardController', function ($scope, $rootScope, $location, $http, $interval, $window, $route, $routeParams, permissions) {
+define(['app', 'livesocket'], function (app) {
+	app.controller('DashboardController', function ($scope, $rootScope, $location, $http, $interval, $window, $route, $routeParams, permissions, livesocket) {
 		var $element = $('#main-view #dashcontent').last();
 
 		$scope.LastUpdateTime = parseInt(0);

www/app/LightsController.js

@@ -1,5 +1,5 @@
-define(['app'], function (app) {
-	app.controller('LightsController', function ($scope, $rootScope, $location, $http, $interval, $route, $routeParams, permissions) {
+define(['app', 'livesocket'], function (app) {
+	app.controller('LightsController', function ($scope, $rootScope, $location, $http, $interval, $route, $routeParams, permissions, livesocket) {
 		var $element = $('#main-view #lightcontent').last();
 
 		$scope.HasInitializedAddManualDialog = false;

www/app/ScenesController.js

@@ -1,5 +1,5 @@
-define(['app'], function (app) {
-	app.controller('ScenesController', ['$scope', '$rootScope', '$location', '$http', '$interval', 'permissions', function ($scope, $rootScope, $location, $http, $interval, permissions) {
+define(['app', 'livesocket'], function (app) {
+	app.controller('ScenesController', ['$scope', '$rootScope', '$location', '$http', '$interval', 'permissions', function ($scope, $rootScope, $location, $http, $interval, permissions, livesocket) {
 
 		var SceneIdx = 0;
 

www/app/TemperatureController.js

@@ -1,5 +1,5 @@
-define(['app'], function (app) {
-	app.controller('TemperatureController', function ($scope, $rootScope, $location, $http, $interval, $window, $route, $routeParams, permissions) {
+define(['app', 'livesocket'], function (app) {
+	app.controller('TemperatureController', function ($scope, $rootScope, $location, $http, $interval, $window, $route, $routeParams, permissions, livesocket) {
 		var $element = $('#main-view #tempcontent').last();
 
 		var ctrl = this;