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

Merge pull request #1131 from Terny22/develop/2.1.2

Browse Source 
Zooming by scrollwheel in GoogleMaps widgets and updated Spanish locale
This commit is contained in:
Igor Kulikov 2018-10-09 16:41:27 +03:00 committed by GitHub
commit c2d7d49009
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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() {
tbMap.map = new google.maps.Map($containerElement[0], { // eslint-disable-line no-undef
scrollwheel: false,
scrollwheel: true,
mapTypeId: getGoogleMapTypeId(tbMap.defaultMapType),
zoom: tbMap.defaultZoomLevel || 8
});