dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ashvayka/thingsboard

Browse Source
This commit is contained in:
Andrew Shvayka 2016-12-04 23:33:58 +02:00
commit 887cb712ec
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/app/api/telemetry-websocket.service.js
View File

@ -21,7 +21,7 @@ export default angular.module('thingsboard.api.telemetryWebsocket', [thingsboard
.name; .name;
/*@ngInject*/ /*@ngInject*/
function TelemetryWebsocketService($log, $websocket, $timeout, $window, types, userService) { function TelemetryWebsocketService($websocket, $timeout, $window, types, userService) {
var isOpening = false, var isOpening = false,
isOpened = false, isOpened = false,
@ -57,9 +57,7 @@ function TelemetryWebsocketService($log, $websocket, $timeout, $window, types, u
if (isOpened && (cmdsWrapper.tsSubCmds.length > 0 || if (isOpened && (cmdsWrapper.tsSubCmds.length > 0 ||
cmdsWrapper.historyCmds.length > 0 || cmdsWrapper.historyCmds.length > 0 ||
cmdsWrapper.attrSubCmds.length > 0)) { cmdsWrapper.attrSubCmds.length > 0)) {
$log.debug("Sending subscription commands!");
dataStream.send(angular.copy(cmdsWrapper)).then(function () { dataStream.send(angular.copy(cmdsWrapper)).then(function () {
$log.debug("Subscription commands were sent!");
checkToClose(); checkToClose();
}); });
cmdsWrapper.tsSubCmds = []; cmdsWrapper.tsSubCmds = [];
@ -69,21 +67,17 @@ function TelemetryWebsocketService($log, $websocket, $timeout, $window, types, u
tryOpenSocket(); tryOpenSocket();
} }
function onError (message) { function onError (/*message*/) {
$log.debug("Websocket error:");
$log.debug(message);
isOpening = false; isOpening = false;
} }
function onOpen () { function onOpen () {
$log.debug("Websocket opened");
isOpening = false; isOpening = false;
isOpened = true; isOpened = true;
publishCommands(); publishCommands();
} }
function onClose () { function onClose () {
$log.debug("Websocket closed");
isOpening = false; isOpening = false;
isOpened = false; isOpened = false;
} }

3
ui/src/app/help/help-links.constant.js
View File

@ -46,8 +46,7 @@ var pluginActionsClazzHelpLinkMap = {
'org.thingsboard.server.extensions.rest.action.RestApiCallPluginAction': 'pluginActionRestApiCall' 'org.thingsboard.server.extensions.rest.action.RestApiCallPluginAction': 'pluginActionRestApiCall'
}; };
//var helpBaseUrl = "http://thingsboard.io"; var helpBaseUrl = "http://thingsboard.io";
var helpBaseUrl = "http://localhost:4000";
export default angular.module('thingsboard.help', []) export default angular.module('thingsboard.help', [])
.constant('helpLinks', .constant('helpLinks',