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

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

Browse Source
This commit is contained in:
Andrew Shvayka 2017-08-09 17:46:34 +03:00
commit a99bad1061
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/src/app/dashboard/states/entity-state-controller.js
View File

@ -139,6 +139,11 @@ export default function EntityStateController($scope, $location, $state, $stateP
var params = vm.stateObject[index].params; var params = vm.stateObject[index].params;
var entityName = params && params.entityName ? params.entityName : ''; var entityName = params && params.entityName ? params.entityName : '';
result = utils.insertVariable(stateName, 'entityName', entityName); result = utils.insertVariable(stateName, 'entityName', entityName);
for (var prop in params) {
if (params[prop] && params[prop].entityName) {
result = utils.insertVariable(stateName, prop + ':entityName', params[prop].entityName);
}
}
} }
return result; return result;
} }
@ -163,7 +168,7 @@ export default function EntityStateController($scope, $location, $state, $stateP
); );
} }
} else { } else {
deferred.reject(); deferred.resolve('');
} }
return deferred.promise; return deferred.promise;
} }

11
ui/src/app/widget/lib/image-map.js
View File

@ -26,8 +26,9 @@ const pinSvg = `<svg class="image-map-pin-image" xmlns="http://www.w3.org/2000/s
export default class TbImageMap { export default class TbImageMap {
constructor($containerElement, initCallback, imageUrl, posFunction) { constructor(ctx, $containerElement, initCallback, imageUrl, posFunction) {
this.ctx = ctx;
this.tooltips = []; this.tooltips = [];
$containerElement.append('<div id="image-map-container"><div id="image-map"></div></div>'); $containerElement.append('<div id="image-map-container"><div id="image-map"></div></div>');
@ -195,7 +196,7 @@ export default class TbImageMap {
} }
createTooltip(marker, pattern, replaceInfo, markerArgs) { createTooltip(marker, pattern, replaceInfo, markerArgs) {
var popup = new Popup(marker.pinElement); var popup = new Popup(this.ctx, marker.pinElement);
popup.setContent(''); popup.setContent('');
this.tooltips.push( { this.tooltips.push( {
markerArgs: markerArgs, markerArgs: markerArgs,
@ -271,7 +272,7 @@ class Position {
} }
class Popup { class Popup {
constructor(anchor) { constructor(ctx, anchor) {
anchor.tooltipster( anchor.tooltipster(
{ {
theme: 'tooltipster-shadow', theme: 'tooltipster-shadow',
@ -287,9 +288,11 @@ class Popup {
this.tooltip = anchor.tooltipster('instance'); this.tooltip = anchor.tooltipster('instance');
var contentElement = angular.element('<div class="image-map-pin-tooltip">' + var contentElement = angular.element('<div class="image-map-pin-tooltip">' +
'<a class="image-map-pin-tooltip-close-button" id="close" style="outline: none;">×</a>' + '<a class="image-map-pin-tooltip-close-button" id="close" style="outline: none;">×</a>' +
'<div flex id="tooltip-content" layout="column">' + '<div id="tooltip-content">' +
'</div>' + '</div>' +
'</div>'); '</div>');
var $compile = ctx.$scope.$injector.get('$compile');
$compile(contentElement)(ctx.$scope);
var popup = this; var popup = this;
contentElement.find('#close').on('click', function() { contentElement.find('#close').on('click', function() {
popup.tooltip.close(); popup.tooltip.close();

2
ui/src/app/widget/lib/map-widget2.js
View File

@ -79,7 +79,7 @@ export default class TbMapWidgetV2 {
} else if (mapProvider === 'openstreet-map') { } else if (mapProvider === 'openstreet-map') {
this.map = new TbOpenStreetMap($element, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel); this.map = new TbOpenStreetMap($element, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel);
} else if (mapProvider === 'image-map') { } else if (mapProvider === 'image-map') {
this.map = new TbImageMap($element, initCallback, settings.mapImageUrl, settings.posFunction); this.map = new TbImageMap(this.ctx, $element, initCallback, settings.mapImageUrl, settings.posFunction);
} }
} }