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

2018-10-09 18:51:35 +03:00 · 2018-10-09 18:51:35 +03:00 · db30e8f8d1
commit db30e8f8d1
parent 94cb347899 c2d7d49009
2 changed files with 1173 additions and 935 deletions
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
--- a/ui/src/app/widget/lib/google-map.js
+++ b/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
            });