~ Change: Respect gui.graph_legend

~ Change: Updated MooTools to v1.3.1 @ Code: Cleaned up speedgraph.js
bittorrent · Mar 19, 2011 · 4914c14 · 4914c14
1 parent 4303d02
commit 4914c14
Show file tree

Hide file tree

Showing 8 changed files with 680 additions and 525 deletions.
diff --git a/flotr.js b/flotr.js
@@ -1193,12 +1193,24 @@ var Flotr = (function(){
 		}
 
 		function insertLegend(){
-			if (!options.legend.show) return;
-
 // uTorrent WebUI Patch - BEGIN
+//			if (!options.legend.show) return;
+
 			// Allocate a unique legend for each plot. Otherwise, a new element is created on
 			// each refresh, but never destroyed (leading to wasted resources).
 			var lgndId = this.id + "-legend";
+
+			if (!options.legend.show) {
+				if (this.__insertLegend_inserted__) {
+					this.__insertLegend_inserted__ = false;
+					var lgnd = $(lgndId), lgndbg = $(lgndId + "-bg");
+					if (lgnd) lgnd.empty();
+					if (lgndbg) lgndbg.destroy();
+				}
+				return;
+			}
+
+			this.__insertLegend_inserted__ = true;
 // uTorrent WebUI Patch - END
 
 			var fragments = [];
@@ -1235,7 +1247,11 @@ var Flotr = (function(){
 					if (p.charAt(1) == 'e')
 						pos.right = (m + plotOffset.right) + 'px';
 					else if (p.charAt(1) == 'w')
-						pos.left = (m + plotOffset.bottom) + 'px';
+// uTorrent WebUI Patch - BEGIN
+//						pos.left = (m + plotOffset.bottom) + 'px';
+						pos.left = (m + plotOffset.left) + 'px';
+// uTorrent WebUI Patch - END
+
 // uTorrent WebUI Patch - BEGIN
 //					var div = new Element('div').addClass('flotr-legend').setStyles($extend(pos, {
 //						'position': 'absolute',
@@ -1252,7 +1268,7 @@ var Flotr = (function(){
 
 						target.adopt(div);
 					}
-					div.set("html", table);
+					div.setStyles(pos).set("html", table);
 // uTorrent WebUI Patch - END
 
 					if (options.legend.backgroundOpacity != 0.0) {

diff --git a/guest.html b/guest.html
@@ -103,16 +103,16 @@
 		<!-- [jscompact] -->
 		<script type="text/javascript" src="./mootools.js"></script>
 		<script type="text/javascript" src="./flotr.js"></script>
+		<script type="text/javascript" src="./utils.js"></script>
 
 		<script type="text/javascript" src="./constants.js"></script>
 		<script type="text/javascript" src="./lang/_.js"></script>
-		<script type="text/javascript" src="./utils.js"></script>
 		<script type="text/javascript" src="./logger.js"></script>
+		<script type="text/javascript" src="./speedgraph.js"></script>
 		<script type="text/javascript" src="./stable.js"></script>
+		<script type="text/javascript" src="./tabs.js"></script>
 		<script type="text/javascript" src="./webui.js"></script>
 		<script type="text/javascript" src="./contextmenu.js"></script>
-		<script type="text/javascript" src="./speedgraph.js"></script>
-		<script type="text/javascript" src="./tabs.js"></script>
 		<script type="text/javascript" src="./main.js"></script>
 		<!-- [/jscompact] -->
 	</body>

diff --git a/index.html b/index.html
@@ -1189,12 +1189,12 @@
 		<script type="text/javascript" src="./constants.js"></script>
 		<script type="text/javascript" src="./lang/_.js"></script>
 		<script type="text/javascript" src="./logger.js"></script>
+		<script type="text/javascript" src="./speedgraph.js"></script>
 		<script type="text/javascript" src="./stable.js"></script>
+		<script type="text/javascript" src="./tabs.js"></script>
 		<script type="text/javascript" src="./webui.js"></script>
 		<script type="text/javascript" src="./contextmenu.js"></script>
 		<script type="text/javascript" src="./dialogmanager.js"></script>
-		<script type="text/javascript" src="./speedgraph.js"></script>
-		<script type="text/javascript" src="./tabs.js"></script>
 		<script type="text/javascript" src="./main.js"></script>
 		<!-- [/jscompact] -->
 	</body>

diff --git a/main.js b/main.js
@@ -392,7 +392,7 @@ function resizeUI(hDiv, vDiv) {
 			var dh = wh - vDiv - $("mainInfoPane-tabs").getSize().y - (showSB ? 1 : 0) - 14;
 			$("mainInfoPane-content").setStyles({"width": dw - 8, "height": dh});
 			$("mainInfoPane-generalTab").setStyles({"width": dw - 10, "height": dh - 2});
-			SpeedGraph.resize(dw - 8, dh);
+			utWebUI.spdGraph.resizeTo(dw - 8, dh);
 			$("mainInfoPane-loggerTab").setStyles({"width": dw - 14, "height": dh - 6});
 			utWebUI.prsTable.resizeTo(dw - 10, dh - 2);
 			utWebUI.flsTable.resizeTo(dw - 10, dh - 2);
@@ -560,7 +560,7 @@ function setupUserInterface() {
 
 	// -- Speed Tab
 
-	SpeedGraph.init("mainInfoPane-speedTab");
+	utWebUI.spdGraph.create("mainInfoPane-speedTab");
 
 	// -- Logger Tab
 
@@ -1463,11 +1463,10 @@ function loadLangStrings(reload) {
 
 	// -- Speed Tab
 
-	SpeedGraph.setLabels(
+	utWebUI.spdGraph.setLabels(
 		  _("OV_COL_UPSPD")
 		, _("OV_COL_DOWNSPD")
 	);
-	SpeedGraph.draw();
 
 	//--------------------------------------------------
 	// STATUS