Merge branch 'i382' of https://github.com/kberg/dygraphs into i382

[dygraphs.git] / dygraph-options.js

diff --git a/dygraph-options.js b/dygraph-options.js
index 27d5efe..55bfe1a 100644 (file)
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -1,9 +1,19 @@
 /**
+ * @license
+ * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
+ * MIT-licensed (http://opensource.org/licenses/MIT)
+ */
+
+/**
  * @fileoverview DygraphOptions is responsible for parsing and returning information about options.
  *
  * Still tightly coupled to Dygraphs, we could remove some of that, you know.
  */
 
+var DygraphOptions = (function() {
+
+/*jshint sub:true */
+/*global Dygraph:false */
 "use strict";
 
 /*
@@ -68,8 +78,8 @@ DygraphOptions.axisToIndex_ = function(axis) {
     throw "Dygraphs only supports two y-axes, indexed from 0-1.";
   }
   if (typeof(axis) == "object") {
-    throw "Using objects for axis specification "
-      + "is not supported inside the 'series' option.";
+    throw "Using objects for axis specification " +
+        "is not supported inside the 'series' option.";
   }
   if (axis) {
     throw "Unknown axis : " + axis;
@@ -80,7 +90,7 @@ DygraphOptions.axisToIndex_ = function(axis) {
 
 /**
  * Reparses options that are all related to series. This typically occurs when
- * options are either updated, or source data has been made avaialble.
+ * options are either updated, or source data has been made available.
  *
  * TODO(konigsberg): The method name is kind of weak; fix.
  */
@@ -195,7 +205,7 @@ DygraphOptions.prototype.reparseSeries = function() {
  */
 DygraphOptions.prototype.get = function(name) {
   var result = this.getGlobalUser_(name);
-  if (result != null) {
+  if (result !== null) {
     return result;
   }
   return this.getGlobalDefault_(name);
@@ -216,7 +226,7 @@ DygraphOptions.prototype.getGlobalDefault_ = function(name) {
     return Dygraph.DEFAULT_ATTRS[name];
   }
   return null;
-}
+};
 
 /**
  * Get a value for a specific axis. If there is no specific value for the axis,
@@ -233,7 +243,7 @@ DygraphOptions.prototype.getForAxis = function(name, axis) {
   // Since axis can be a number or a string, straighten everything out here.
   if (typeof(axis) == 'number') {
     axisIdx = axis;
-    axisString = axisIdx == 0 ? "y" : "y2";
+    axisString = axisIdx === 0 ? "y" : "y2";
   } else {
     if (axis == "y1") { axis = "y"; } // Standardize on 'y'. Is this bad? I think so.
     if (axis == "y") {
@@ -260,7 +270,7 @@ DygraphOptions.prototype.getForAxis = function(name, axis) {
 
   // User-specified global options second.
   var result = this.getGlobalUser_(name);
-  if (result != null) {
+  if (result !== null) {
     return result;
   }
 
@@ -347,3 +357,7 @@ DygraphOptions.prototype.seriesNames = function() {
 DygraphOptions.prototype.indexOfSeries = function(series) {
   return this.series_[series].idx;
 };
+
+return DygraphOptions;
+
+})();