Fix test_scroll_zoom_toggler

Author: Martin Journois

folium/plugins/scroll_zoom_toggler.py

@@ -5,48 +5,54 @@
 
 Adds a button to enable/disable zoom scrolling.
 """
-from .template_plugin import TemplatePlugin
-
-class ScrollZoomToggler(TemplatePlugin):
-    """Adds a button to enable/disable zoom scrolling."""
-    template = """
-    {% set plugin_name = "ScrollZoomToggler" %}
-    {% macro css(nb) %}
-        #ScrollZoomToggler_{{nb}} {
-                position:absolute;
-                width:35px;
-                bottom:10px;
-                height:35px;
-                left:10px;
-                background-color:#fff;
-                text-align:center;
-                line-height:35px;
-                vertical-align: middle;
-                }
-    {% endmacro %}
-
-    {% macro html(nb) %}
-        <img id="ScrollZoomToggler_{{nb}}" alt="scroll"
-           src="https://cdnjs.cloudflare.com/ajax/libs/ionicons/1.5.2/png/512/arrow-move.png"
-           onclick="toggleScroll()"></img>
-    {% endmacro %}
-
-    {% macro js(nb) %}
-        {% if nb==0 %}
-            map.scrollEnabled = true;
-
-            var toggleScroll = function() {
-                if (map.scrollEnabled) {
-                    map.scrollEnabled = false;
-                    map.scrollWheelZoom.disable();
-                    }
-                else {
-                    map.scrollEnabled = true;
-                    map.scrollWheelZoom.enable();
-                    }
-                };
-
-            toggleScroll();
-        {% endif %}
-    {% endmacro %}
-    """
+from jinja2 import Template
+
+from folium.element import MacroElement, Figure, Element
+
+class ScrollZoomToggler(MacroElement):
+    def __init__(self):
+        """TODO docstring here.
+        """
+        super(ScrollZoomToggler, self).__init__()
+        self._name = 'ScrollZoomToggler'
+
+        self._template = Template("""
+            {% macro header(this,kwargs) %}
+                <style>
+                    #{{this.get_name()}} {
+                        position:absolute;
+                        width:35px;
+                        bottom:10px;
+                        height:35px;
+                        left:10px;
+                        background-color:#fff;
+                        text-align:center;
+                        line-height:35px;
+                        vertical-align: middle;
+                        }
+                </style>
+            {% endmacro %}
+
+            {% macro html(this,kwargs) %}
+                <img id="{{this.get_name()}}" alt="scroll"
+                   src="https://cdnjs.cloudflare.com/ajax/libs/ionicons/1.5.2/png/512/arrow-move.png"
+                   onclick="{{this._parent.get_name()}}.toggleScroll()"></img>
+            {% endmacro %}
+
+            {% macro script(this,kwargs) %}
+                    {{this._parent.get_name()}}.scrollEnabled = true;
+
+                    {{this._parent.get_name()}}.toggleScroll = function() {
+                        if (this.scrollEnabled) {
+                            this.scrollEnabled = false;
+                            this.scrollWheelZoom.disable();
+                            }
+                        else {
+                            this.scrollEnabled = true;
+                            this.scrollWheelZoom.enable();
+                            }
+                        };
+
+                    {{this._parent.get_name()}}.toggleScroll();
+            {% endmacro %}
+            """)

tests/test_plugins.py

@@ -17,8 +17,8 @@ class TestPlugins(object):
 
     def test_scroll_zoom_toggler(self):
         mapa = folium.Map([45., 3.], zoom_start=4)
-        mapa.add_plugin(plugins.ScrollZoomToggler())
-        mapa._build_map()
+        mapa.add_children(plugins.ScrollZoomToggler())
+        mapa._repr_html_()
 
     def test_marker_cluster(self):
         N = 100