Browse Source

Merge pull request #1131 from Terny22/develop/2.1.2

Zooming by scrollwheel in GoogleMaps widgets and updated Spanish locale
pull/1136/head
Igor Kulikov 8 years ago
committed by GitHub
parent
commit
c2d7d49009
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2104
      ui/src/app/locale/locale.constant-es_ES.json
  2. 2
      ui/src/app/widget/lib/google-map.js

2104
ui/src/app/locale/locale.constant-es_ES.json

File diff suppressed because it is too large

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

@ -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
});

Loading…
Cancel
Save