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

Merge remote-tracking branch 'origin/develop/2.1.2' into feature/entity-view-type

Browse Source
This commit is contained in:
Volodymyr Babak 2018-10-09 18:51:35 +03:00
commit db30e8f8d1
2 changed files with 1173 additions and 935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2106
ui/src/app/locale/locale.constant-es_ES.json
View File

File diff suppressed because it is too large Load Diff

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

@ -44,7 +44,7 @@ export default class TbGoogleMap {
function initGoogleMap() { function initGoogleMap() {
tbMap.map = new google.maps.Map($containerElement[0], { // eslint-disable-line no-undef tbMap.map = new google.maps.Map($containerElement[0], { // eslint-disable-line no-undef
scrollwheel: false, scrollwheel: true,
mapTypeId: getGoogleMapTypeId(tbMap.defaultMapType), mapTypeId: getGoogleMapTypeId(tbMap.defaultMapType),
zoom: tbMap.defaultZoomLevel || 8 zoom: tbMap.defaultZoomLevel || 8
}); });