Perform createLegend at the same time as areas

neveldo · web-flow · commit a74e84de266a · 2017-11-14T18:19:03.000+01:00
diff --git a/examples/advanced/legend_show_hide.html b/examples/advanced/legend_show_hide.html
@@ -89,7 +89,8 @@
                                 attrs: {
                                     fill: "#2579b5"
                                 },
-                                label: "Between 10 millions and 50 millions inhabitants"
+                                label: "Between 10 millions and 50 millions inhabitants",
+                                clicked: true
                             },
                             {
                                 min: 50000000,
@@ -101,8 +102,8 @@
                         ]
                     },
                     plot: {
-                        title: "Cities population"
-                        , slices: [
+                        title: "Cities population",
+                        slices: [
                             {
                                 max: 500000,
                                 attrs: {
@@ -138,7 +139,8 @@
                                     "stroke-width": 1
                                 },
                                 label: "More than 1 million inhabitants",
-                                size: 30
+                                size: 30,
+                                clicked: true
                             }
                         ]
                     }
diff --git a/examples/basic/legend_SVG_paths.html b/examples/basic/legend_SVG_paths.html
@@ -81,7 +81,7 @@
         .mapael .zoomOut {
             top: 50px;
         }
-        
+
     </style>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" charset="utf-8"></script>
@@ -124,7 +124,8 @@
                             height: 30,
                             attrs: {
                                 fill: "#8AD12C"
-                            }
+                            },
+                            clicked: true
                         }, {
                             label: "Value 2",
                             sliceValue: "Value 2",
@@ -221,4 +222,4 @@ <h1>Map with SVG paths defined through the legend to plot some cities</h1>
 
 
 </body>
-</html>
+</html>
diff --git a/js/jquery.mapael.js b/js/jquery.mapael.js
@@ -189,9 +189,6 @@
             if (self.options.map.width) {
                 // NOT responsive: map has a fixed width
                 self.paper.setSize(self.options.map.width, self.mapConf.height * (self.options.map.width / self.mapConf.width));
-
-                // Create the legends for plots taking into account the scale of the map
-                self.createLegends("plot", self.plots, (self.options.map.width / self.mapConf.width));
             } else {
                 // Responsive: handle resizing of the map
                 self.initResponsiveSize();
@@ -249,6 +246,9 @@
             // Create the legends for areas
             self.createLegends("area", self.areas, 1);
 
+            // Create the legends for plots taking into account the scale of the map
+            self.createLegends("plot", self.plots, self.paper.width / self.mapConf.width);
+
             // Attach update event
             self.$container.on("update." + pluginName, function (e, opt) {
                 self.onUpdateEvent(e, opt);
@@ -341,7 +341,8 @@
                     self.paper.setSize(containerWidth, self.mapConf.height * newScale);
 
                     // Create plots legend again to take into account the new scale
-                    if (isInit || self.options.legend.redrawOnResize) {
+                    // Do not do this on init (it will be done later)
+                    if (isInit !== true && self.options.legend.redrawOnResize) {
                         self.createLegends("plot", self.plots, newScale);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@`
`89`	`89`	`attrs: {`
`90`	`90`	`fill: "#2579b5"`
`91`	`91`	`},`
`92`		`- label: "Between 10 millions and 50 millions inhabitants"`
	`92`	`+ label: "Between 10 millions and 50 millions inhabitants",`
	`93`	`+ clicked: true`
`93`	`94`	`},`
`94`	`95`	`{`
`95`	`96`	`min: 50000000,`
`@@ -101,8 +102,8 @@`
`101`	`102`	`]`
`102`	`103`	`},`
`103`	`104`	`plot: {`
`104`		`- title: "Cities population"`
`105`		`- , slices: [`
	`105`	`+ title: "Cities population",`
	`106`	`+ slices: [`
`106`	`107`	`{`
`107`	`108`	`max: 500000,`
`108`	`109`	`attrs: {`
`@@ -138,7 +139,8 @@`
`138`	`139`	`"stroke-width": 1`
`139`	`140`	`},`
`140`	`141`	`label: "More than 1 million inhabitants",`
`141`		`- size: 30`
	`142`	`+ size: 30,`
	`143`	`+ clicked: true`
`142`	`144`	`}`
`143`	`145`	`]`
`144`	`146`	`}`