From: Robert Konigsberg <konigsberg@gmail.com>
Date: Tue, 16 Apr 2013 14:15:18 +0000 (-0400)
Subject: Merge branch 'master' of github.com:danvk/dygraphs into closure
X-Git-Tag: v1.0.0~38^2~2
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=72621b9af29dbd2e1729c3d841e2eef8027ca9b7;p=dygraphs.git

Merge branch 'master' of github.com:danvk/dygraphs into closure

Conflicts:
	dygraph-options.js
---

72621b9af29dbd2e1729c3d841e2eef8027ca9b7
diff --cc closure-todo.txt
index 9852856,5c61495..bd42895
--- a/closure-todo.txt
+++ b/closure-todo.txt
@@@ -30,11 -30,8 +30,11 @@@ Plugins
  - plugins/grid.js
  - plugins/legend.js
  
 +Others:
 +x rgbcolor/rgbcolor.js
 +
  Here's a command that can be used to build dygraphs using the closure
  compiler:
- java -jar ../../closure-compiler-read-only/build/compiler.jar --js=dygraph-utils.js --js=dashed-canvas.js --js=dygraph-options-reference.js --js=dygraph-tickers.js --js=dygraph-gviz.js --js_output_file=/tmp/out.js --compilation_level ADVANCED_OPTIMIZATIONS --warning_level VERBOSE --externs dygraph-externs.js
+ java -jar ../../closure-compiler-read-only/build/compiler.jar --js=dygraph-utils.js --js=dashed-canvas.js --js=dygraph-options-reference.js --js=dygraph-tickers.js --js=dygraph-gviz.js --js=dygraph-options.js --js_output_file=/tmp/out.js --compilation_level ADVANCED_OPTIMIZATIONS --warning_level VERBOSE --externs dygraph-externs.js
  
  As each file is closurized, it can be added as a "--js" parameter.
diff --cc dygraph-options.js
index ccba4f8,5fa8f3e..334b2f6
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@@ -34,23 -38,13 +34,23 @@@ var DygraphOptions = (function() 
   * @constructor
   */
  var DygraphOptions = function(dygraph) {
 +  /**
 +   * The dygraph.
 +   * @type {Dygraph}
 +   */
    this.dygraph_ = dygraph;
  
 -  /** @type {Array.<{options: Object, series: string}>} @private */
 +  /**
 +   * Array of axis index to { series : [ series names ] , options : { axis-specific options. }
-    * @type {Array.<{series : Array.<string>, options : Object}>}
++   * @type {Array.<{series : Array.<string>, options : Object}>} @private
 +   */
    this.yAxes_ = [];
 -  /** @type {{options: Object}} @private */
 -  this.xAxis_ = {options: {}};
 -  /** @type {Object} @private */
 +
 +  /**
-    * { options : { axis-specific options. }
-    * @type {Object}
++   * { options : { axis-specific options. } }
++   * @type {Object} @private
 +   */
 +  this.xAxis_ = {};
    this.series_ = {};
  
    // Once these two objects are initialized, you can call get();