From b009b371aaadf619b494319ee6c39be114d4477c Mon Sep 17 00:00:00 2001 From: Anthony Ryan Date: Tue, 5 Nov 2013 13:49:47 -0500 Subject: [PATCH] Address formatting concerns * Removed self-closing tags * Move the the nested divs into variables * Expand the object literals for easier reading --- jquery.flot.js | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/jquery.flot.js b/jquery.flot.js index 9060a9c..bcfa179 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -2971,7 +2971,7 @@ Licensed under the MIT license. // Generate markup for the list of entries, in their final order - var table = $("").css({ + var table = $("
").css({ "font-size": "smaller", "color": options.grid.color }); @@ -2984,16 +2984,24 @@ Licensed under the MIT license. if (rowBuffer !== null) { table.append(rowBuffer); } - rowBuffer = $(""); + rowBuffer = $(""); } + var colorbox = $("
").css({ + "width": "4px", + "height": 0, + "border": "5px solid " + entry.color, + "overflow": "hidden" + }), + + borderbox = $("
").css({ + "border": "1px solid " + options.legend.labelBoxBorderColor, + "padding": "1px" + }); + rowBuffer.append( - $("
").addClass("legendColorBox").append( - $("
").css({"border": "1px solid " + options.legend.labelBoxBorderColor, "padding": "1px"}).append( - $("
").css({"width": "4px", "height": 0, "border": "5px solid " + entry.color, "overflow": "hidden"}) - ) - ), - $("
").addClass("legendLabel").html(entry.label) + $("").addClass("legendColorBox").append(borderbox.append(colorbox)), + $("").addClass("legendLabel").html(entry.label) ); } @@ -3016,7 +3024,7 @@ Licensed under the MIT license. } else if (p.charAt(1) === "w") { pos.left = (m[0] + plotOffset.left) + "px"; } - var legend = $("
").addClass("legend").append(table.css(pos)).appendTo(placeholder); + var legend = $("
").addClass("legend").append(table.css(pos)).appendTo(placeholder); if (options.legend.backgroundOpacity !== 0.0) { // put in the transparent background // separately to avoid blended labels and @@ -3035,7 +3043,7 @@ Licensed under the MIT license. var div = legend.children(); // Position also applies to this - $("
").css(pos).css({ + $("
").css(pos).css({ "width": div.width() + "px", "height": div.height() + "px", "background-color": c,