Projet

Général

Profil

0001-maps-use-Leaflet.GestureHandling-to-avoid-zooming-on.patch

Frédéric Péters, 17 janvier 2020 12:14

Télécharger (3,08 ko)

Voir les différences: 

Subject: [PATCH] maps: use Leaflet.GestureHandling to avoid zooming on map
 during scroll (#39057)


 combo/apps/maps/models.py              | 6 ++++--
 combo/apps/maps/static/js/combo.map.js | 1 +
 combo/settings.py                      | 1 +
 debian/control                         | 1 +
 setup.py                               | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)
combo/apps/maps/models.py
277 277 
    class Media:
278 278 
        js = ('/jsi18n',
279 279 
              'xstatic/leaflet.js', 'js/leaflet-gps.js', 'js/combo.map.js',
280 
              'xstatic/leaflet.markercluster.js')
281 
        css = {'all': ('xstatic/leaflet.css', 'css/combo.map.css')}
280 
              'xstatic/leaflet.markercluster.js',
281 
              'xstatic/leaflet-gesture-handling.min.js',
282 
              )
283 
        css = {'all': ('xstatic/leaflet.css', 'css/combo.map.css', 'xstatic/leaflet-gesture-handling.min.css')}
282 284 

  		




  283
  285
  
    
    def get_default_position(self):

  		




  284
  286
  
    
        return settings.COMBO_MAP_DEFAULT_POSITION

  		












  

    
      combo/apps/maps/static/js/combo.map.js
    
  





  131
  131
  
    
                  L.latLng($map_widget.data('max-bounds-lat1'), $map_widget.data('max-bounds-lng1')),

  		




  132
  132
  
    
                  L.latLng($map_widget.data('max-bounds-lat2'), $map_widget.data('max-bounds-lng2')))

  		




  133
  133
  
    
        }

  		




  
  134
  
    
        map_options.gestureHandling = true;

  		




  134
  135
  
    
        var map = L.map($map_widget[0], map_options);

  		




  135
  136
  
    
        if ($map_widget.data('draggable') === false) {

  		




  136
  137
  
    
          map.dragging.disable();

  		












  

    
      combo/settings.py
    
  





  82
  82
  
    
    'xstatic.pkg.opensans',

  		




  83
  83
  
    
    'xstatic.pkg.roboto_fontface',

  		




  84
  84
  
    
    'xstatic.pkg.leaflet_markercluster',

  		




  
  85
  
    
    'xstatic.pkg.leaflet_gesturehandling',

  		




  85
  86
  
    
)

  		




  86
  87
  
    

  		




  87
  88
  
    
MIDDLEWARE = (

  		












  

    
      debian/control
    
  





  16
  16
  
    
    python3-feedparser,

  		




  17
  17
  
    
    python3-xstatic-josefinsans,

  		




  18
  18
  
    
    python3-xstatic-leaflet,

  		




  
  19
  
    
    python3-xstatic-leaflet-gesturehandling,

  		




  19
  20
  
    
    python3-xstatic-leaflet-markercluster,

  		




  20
  21
  
    
    python3-xstatic-opensans,

  		




  21
  22
  
    
    python3-xstatic-roboto-fontface (>= 0.5.0.0),

  		












  

    
      setup.py
    
  





  155
  155
  
    
        'django-jsonfield',

  		




  156
  156
  
    
        'requests',

  		




  157
  157
  
    
        'XStatic-Leaflet',

  		




  
  158
  
    
        'XStatic-Leaflet-GestureHandling',

  		




  158
  159
  
    
        'XStatic-Leaflet-MarkerCluster',

  		




  159
  160
  
    
        'XStatic_JosefinSans',

  		




  160
  161
  
    
        'XStatic_OpenSans',

  		




  161
  
  
    
-