X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-layout.js;h=ef1df916ff2154a17ac553c67b2dc19b935cf318;hb=b1e9e2e03dbccf94fff08ab37dc6e8c64c75736d;hp=20e84810f4df520398ac35be57ce1994c40c85a0;hpb=335011fd4473f55aaaceb69726d15e0063373149;p=dygraphs.git

diff --git a/dygraph-layout.js b/dygraph-layout.js
index 20e8481..ef1df91 100644
--- a/dygraph-layout.js
+++ b/dygraph-layout.js
@@ -9,7 +9,8 @@
  * dygraphs.
  */
 
-/*jshint globalstrict: true */
+var DygraphLayout = (function() {
+
 /*global Dygraph:false */
 "use strict";
 
@@ -149,13 +150,13 @@ DygraphLayout.prototype.setAnnotations = function(ann) {
   for (var i = 0; i < ann.length; i++) {
     var a = {};
     if (!ann[i].xval && ann[i].x === undefined) {
-      Dygraph.error("Annotations must have an 'x' property");
+      console.error("Annotations must have an 'x' property");
       return;
     }
     if (ann[i].icon &&
         !(ann[i].hasOwnProperty('width') &&
           ann[i].hasOwnProperty('height'))) {
-      Dygraph.error("Must set width and height when setting " +
+      console.error("Must set width and height when setting " +
                     "annotation.icon property");
       return;
     }
@@ -184,13 +185,13 @@ DygraphLayout.prototype.evaluate = function() {
 
 DygraphLayout.prototype._evaluateLimits = function() {
   var xlimits = this.dygraph_.xAxisRange();
-  this._xAxis.minxval = xlimits[0];
-  this._xAxis.maxxval = xlimits[1];
+  this._xAxis.minval = xlimits[0];
+  this._xAxis.maxval = xlimits[1];
   var xrange = xlimits[1] - xlimits[0];
-  this._xAxis.xscale = (xrange !== 0 ? 1 / xrange : 1.0);
+  this._xAxis.scale = (xrange !== 0 ? 1 / xrange : 1.0);
 
   if (this.dygraph_.getOptionForAxis("logscale", 'x')) {
-    this._xAxis.xlogrange = Dygraph.log10(this._xAxis.maxxval) - Dygraph.log10(this._xAxis.minxval);
+    this._xAxis.xlogrange = Dygraph.log10(this._xAxis.maxval) - Dygraph.log10(this._xAxis.minval);
     this._xAxis.xlogscale = (this._xAxis.xlogrange !== 0 ? 1.0 / this._xAxis.xlogrange : 1.0);
   }
   for (var i = 0; i < this.yAxes_.length; i++) {
@@ -204,7 +205,7 @@ DygraphLayout.prototype._evaluateLimits = function() {
       axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval);
       axis.ylogscale = (axis.ylogrange !== 0 ? 1.0 / axis.ylogrange : 1.0);
       if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) {
-        Dygraph.error('axis ' + i + ' of graph at ' + axis.g +
+        console.error('axis ' + i + ' of graph at ' + axis.g +
                       ' can\'t be displayed in log scale for range [' +
                       axis.minyval + ' - ' + axis.maxyval + ']');
       }
@@ -212,11 +213,11 @@ DygraphLayout.prototype._evaluateLimits = function() {
   }
 };
 
-DygraphLayout.calcXNormal_ = function(value, axis, logscale) {
+DygraphLayout.calcXNormal_ = function(value, xAxis, logscale) {
   if (logscale) {
-    return ((Dygraph.log10(value) - Dygraph.log10(axis.minxval)) * axis.xlogscale);
+    return ((Dygraph.log10(value) - Dygraph.log10(xAxis.minval)) * xAxis.xlogscale);
   } else {
-    return (value - axis.minxval) * axis.xscale;
+    return (value - xAxis.minval) * xAxis.scale;
   }
 };
 
@@ -344,3 +345,7 @@ DygraphLayout.prototype.removeAllDatasets = function() {
   this.setPointsLengths = [];
   this.setPointsOffsets = [];
 };
+
+return DygraphLayout;
+
+})();