X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plugins%2Fchart-labels.js;h=504ed3a24274fd937e5e78bcf8300da7533edbca;hb=c01c6b5cadedea62fbc6dab2457dc67c1201caa4;hp=3e596cd173a4bb6fb171cc6ec67cf078f6f4bb67;hpb=441e4a56ca59ee633813adfeb3162cfbf1c4fc49;p=dygraphs.git

diff --git a/plugins/chart-labels.js b/plugins/chart-labels.js
index 3e596cd..504ed3a 100644
--- a/plugins/chart-labels.js
+++ b/plugins/chart-labels.js
@@ -3,9 +3,14 @@
  * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
  * MIT-licensed (http://opensource.org/licenses/MIT)
  */
+/*global Dygraph:false */
+
 Dygraph.Plugins.ChartLabels = (function() {
 
+"use strict";
+
 // TODO(danvk): move chart label options out of dygraphs and into the plugin.
+// TODO(danvk): only tear down & rebuild the DIVs when it's necessary.
 
 var chart_labels = function() {
   this.title_div_ = null;
@@ -22,7 +27,7 @@ chart_labels.prototype.activate = function(g) {
   return {
     layout: this.layout,
     // clearChart: this.clearChart,
-    drawChart: this.drawChart
+    didDrawChart: this.didDrawChart
   };
 };
 
@@ -57,24 +62,25 @@ chart_labels.prototype.detachLabels_ = function() {
 
 var createRotatedDiv = function(g, box, axis, classes, html) {
   // TODO(danvk): is this outer div actually necessary?
-  div = document.createElement("div");
+  var div = document.createElement("div");
   div.style.position = 'absolute';
   if (axis == 1) {
-    div.style.left = box.left;
+    // NOTE: this is cheating. Should be positioned relative to the box.
+    div.style.left = '0px';
   } else {
-    div.style.right = box.left;
+    div.style.left = box.x + 'px';
   }
-  div.style.top = box.top + 'px';
-  div.style.width = box.width + 'px';
-  div.style.height = box.height + 'px';
+  div.style.top = box.y + 'px';
+  div.style.width = box.w + 'px';
+  div.style.height = box.h + 'px';
   div.style.fontSize = (g.getOption('yLabelWidth') - 2) + 'px';
 
   var inner_div = document.createElement("div");
   inner_div.style.position = 'absolute';
-  inner_div.style.width = box.height + 'px';
-  inner_div.style.height = box.width + 'px';
-  inner_div.style.top = (box.height / 2 - box.width / 2) + 'px';
-  inner_div.style.left = (box.width / 2 - box.height / 2) + 'px';
+  inner_div.style.width = box.h + 'px';
+  inner_div.style.height = box.w + 'px';
+  inner_div.style.top = (box.h / 2 - box.w / 2) + 'px';
+  inner_div.style.left = (box.w / 2 - box.h / 2) + 'px';
   inner_div.style.textAlign = 'center';
 
   // CSS rotation is an HTML5 feature which is not standardized. Hence every
@@ -86,26 +92,14 @@ var createRotatedDiv = function(g, box, axis, classes, html) {
   inner_div.style.OTransform = val;       // Opera
   inner_div.style.msTransform = val;      // IE9
 
-  if (typeof(document.documentMode) !== 'undefined' &&
-      document.documentMode < 9) {
-    // We're dealing w/ an old version of IE, so we have to rotate the text
-    // using a BasicImage transform. This uses a different origin of rotation
-    // than HTML5 rotation (top left of div vs. its center).
-    inner_div.style.filter =
-        'progid:DXImageTransform.Microsoft.BasicImage(rotation=' +
-        (axis == 1 ? '3' : '1') + ')';
-    inner_div.style.left = '0px';
-    inner_div.style.top = '0px';
-  }
-
-  class_div = document.createElement("div");
+  var class_div = document.createElement("div");
   class_div.className = classes;
   class_div.innerHTML = html;
 
   inner_div.appendChild(class_div);
   div.appendChild(inner_div);
   return div;
-}
+};
 
 chart_labels.prototype.layout = function(e) {
   this.detachLabels_();
@@ -116,14 +110,31 @@ chart_labels.prototype.layout = function(e) {
     // QUESTION: should this return an absolutely-positioned div instead?
     var title_rect = e.reserveSpaceTop(g.getOption('titleHeight'));
     this.title_div_ = createDivInRect(title_rect);
-    this.title_div_.className = 'dygraph-label dygraph-title';
-    this.title_div_.innerHTML = g.getOption('title');
     this.title_div_.style.textAlign = 'center';
     this.title_div_.style.fontSize = (g.getOption('titleHeight') - 8) + 'px';
     this.title_div_.style.fontWeight = 'bold';
+    this.title_div_.style.zIndex = 10;
+
+    var class_div = document.createElement("div");
+    class_div.className = 'dygraph-label dygraph-title';
+    class_div.innerHTML = g.getOption('title');
+    this.title_div_.appendChild(class_div);
     div.appendChild(this.title_div_);
   }
 
+  if (g.getOption('xlabel')) {
+    var x_rect = e.reserveSpaceBottom(g.getOption('xLabelHeight'));
+    this.xlabel_div_ = createDivInRect(x_rect);
+    this.xlabel_div_.style.textAlign = 'center';
+    this.xlabel_div_.style.fontSize = (g.getOption('xLabelHeight') - 2) + 'px';
+
+    var class_div = document.createElement("div");
+    class_div.className = 'dygraph-label dygraph-xlabel';
+    class_div.innerHTML = g.getOption('xlabel');
+    this.xlabel_div_.appendChild(class_div);
+    div.appendChild(this.xlabel_div_);
+  }
+
   if (g.getOption('ylabel')) {
     // It would make sense to shift the chart here to make room for the y-axis
     // label, but the default yAxisLabelWidth is large enough that this results
@@ -139,24 +150,31 @@ chart_labels.prototype.layout = function(e) {
     div.appendChild(this.ylabel_div_);
   }
 
-  /*
-  if (g.getOption('xlabel')) {
-    var x_rect = e.reserveSpaceBottom(g.getOption('xLabelHeight'));
-  }
-
-  if (g.getOption('y2label')) {
+  if (g.getOption('y2label') && g.numAxes() == 2) {
+    // same logic applies here as for ylabel.
     var y2_rect = e.reserveSpaceRight(0);
+    this.y2label_div_ = createRotatedDiv(
+        g, y2_rect,
+        2,  // secondary (right) y-axis
+        'dygraph-label dygraph-y2label',
+        g.getOption('y2label'));
+    div.appendChild(this.y2label_div_);
   }
-  */
 };
 
-chart_labels.prototype.drawChart = function(e) {
+chart_labels.prototype.didDrawChart = function(e) {
   var g = e.dygraph;
   if (this.title_div_) {
-    this.title_div_.innerHTML = g.getOption('title');
+    this.title_div_.children[0].innerHTML = g.getOption('title');
+  }
+  if (this.xlabel_div_) {
+    this.xlabel_div_.children[0].innerHTML = g.getOption('xlabel');
   }
   if (this.ylabel_div_) {
-    // this.ylabel_div_.
+    this.ylabel_div_.children[0].children[0].innerHTML = g.getOption('ylabel');
+  }
+  if (this.y2label_div_) {
+    this.y2label_div_.children[0].children[0].innerHTML = g.getOption('y2label');
   }
 };
 
@@ -164,7 +182,7 @@ chart_labels.prototype.clearChart = function() {
 };
 
 chart_labels.prototype.destroy = function() {
-  detachLabels();
+  this.detachLabels_();
 };