From 8ef9d44dd707a3666aaa9c8abd0340e03ba05753 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Fri, 25 Oct 2013 15:02:22 -0500 Subject: [PATCH] misc fixes --- dygraph.js | 21 +++++++++++---------- push-to-web.sh | 2 +- tests/range-selector.html | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dygraph.js b/dygraph.js index 07f2a22..1e4891b 100644 --- a/dygraph.js +++ b/dygraph.js @@ -1231,7 +1231,7 @@ Dygraph.prototype.setColors_ = function() { * Return the list of colors. This is either the list of colors passed in the * attributes or the autogenerated list of rgb(r,g,b) strings. * This does not return colors for invisible series. - * @return {Array} The list of colors. + * @return {Array.} The list of colors. */ Dygraph.prototype.getColors = function() { return this.colors_; @@ -3050,12 +3050,12 @@ Dygraph.prototype.parseCSV_ = function(data) { }; /** - * @private * The user has provided their data as a pre-packaged JS array. If the x values * are numeric, this is the same as dygraphs' internal format. If the x values * are dates, we need to convert them from Date objects to ms since epoch. - * @param {[Object]} data - * @return {[Object]} data with numeric x values. + * @param {!Array} data + * @return {Object} data with numeric x values. + * @private */ Dygraph.prototype.parseArray_ = function(data) { // Peek at the first x value to see if it's numeric. @@ -3324,12 +3324,13 @@ Dygraph.prototype.start_ = function() { * There's a huge variety of options that can be passed to this method. For a * full list, see http://dygraphs.com/options.html. * - * @param {Object} attrs The new properties and values - * @param {Boolean} [block_redraw] Usually the chart is redrawn after every - * call to updateOptions(). If you know better, you can pass true to explicitly - * block the redraw. This can be useful for chaining updateOptions() calls, - * avoiding the occasional infinite loop and preventing redraws when it's not - * necessary (e.g. when updating a callback). + * @param {Object} input_attrs The new properties and values + * @param {boolean} block_redraw Usually the chart is redrawn after every + * call to updateOptions(). If you know better, you can pass true to + * explicitly block the redraw. This can be useful for chaining + * updateOptions() calls, avoiding the occasional infinite loop and + * preventing redraws when it's not necessary (e.g. when updating a + * callback). */ Dygraph.prototype.updateOptions = function(input_attrs, block_redraw) { if (typeof(block_redraw) == 'undefined') block_redraw = false; diff --git a/push-to-web.sh b/push-to-web.sh index 47352c5..232790e 100755 --- a/push-to-web.sh +++ b/push-to-web.sh @@ -30,7 +30,7 @@ if [ -s docs/options.html ] ; then find . -path ./.git -prune -o -print | xargs chmod a+rX # Copy everything to the site. - rsync -avzr gallery common tests jsdoc experimental plugins $site \ + rsync -avzr gallery common tests jsdoc experimental plugins datahandler $site \ && \ rsync -avzr --copy-links dashed-canvas.js stacktrace.js dygraph*.js gadget.xml excanvas.js thumbnail.png screenshot.png $temp_dir/* $site/ else diff --git a/tests/range-selector.html b/tests/range-selector.html index 74a38d6..2cb9615 100644 --- a/tests/range-selector.html +++ b/tests/range-selector.html @@ -71,7 +71,7 @@ xAxisHeight: 30, drawXAxis: false, showRangeSelector: true, - rangeSelectorHeight: 30, + rangeSelectorHeight: 30 } ); -- 2.7.4