node_modules
env
dist
+coverage
+*.log
sudo: false # Use container-based architecture
script: >
- gulp travis &&
+ npm run build &&
+ npm run build-tests &&
+ npm run test &&
+ npm run coverage &&
+ ./scripts/post-coverage.sh &&
curl -O https://raw.githubusercontent.com/danvk/travis-weigh-in/master/weigh_in.py &&
python weigh_in.py dist/dygraph-combined.js
To build dygraphs, run
- gulp dist
+ npm run build
To run the tests, run:
- gulp test
+ npm run build-tests
+ npm run test
-To iterate on the code, open `tests/demo.html` (or one of the other demos) in your browser.
+To iterate on the code, run:
-To iterate on a unit test, change `it` to `it.only` in the Mocha test. Then run
+ npm run watch
- ./node_modules/karma/bin/karma start auto_tests/chrome.karma.conf.js
+and open `tests/demo.html` (or one of the other demos) in your browser.
-and hit "DEBUG" in the Karma UI.
+To iterate on a unit test, run the `watch` command above and open
+
+ auto_tests/runner.html
+
+in your browser. You can use the Mocha UI to run just a single test or suite.
+Or you can change `it` to `it.only` to do run just one test in code.
### dygraphs style
To get going, clone the repo and run:
npm install
- gulp dist
+ npm run build
+
+Then open `tests/demo.html` in your browser.
Read more about the dygraphs development process in the [developer guide](/DEVELOP.md).
## License(s)
-dygraphs uses:
- - UglifyJS (BSD License)
- - JsDoc Toolkit (MIT license)
- - console-polyfill (MIT license)
-
-automated tests use:
- - auto_tests/lib/jquery-1.4.2.js (MIT & GPL2)
- - auto_tests/lib/Asserts.js (Apache 2.0 License)
- - auto-tests/lib/JsTestDriver-1.3.3cjar (Apache 2.0 License)
-
dygraphs is available under the MIT license, included in LICENSE.txt.
+++ /dev/null
-module.exports = function (config) {
- config.set({
- basePath: '../',
- frameworks: [
- 'mocha',
- 'chai'
- ],
- files: [
- 'dist/dygraph-combined-dev.js',
- 'src/extras/smooth-plotter.js',
- 'src/extras/synchronizer.js',
- 'auto_tests/data/*.js',
- 'auto_tests/tests/*.js',
- ],
- autoWatch: true,
- singleRun: false,
- reporters: ['mocha'], // or 'dots', 'mocha', 'spec'
- browsers: ['Chrome'], // or 'Firefox', 'Safari', etc.
- plugins: [
- 'karma-mocha',
- 'karma-chai-plugins',
- 'karma-chrome-launcher',
- 'karma-firefox-launcher',
- 'karma-spec-reporter',
- 'karma-mocha-reporter'
- ]
- });
-};
--- /dev/null
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>dygraphs tests</title>
+ <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+</head>
+<body>
+ <div id="graph"></div>
+ <div id="mocha"></div>
+
+ <!-- Polyfills for PhantomJS -->
+ <script src="../node_modules/babel-core/browser-polyfill.js"></script>
+
+ <!-- Mocha -->
+ <script src="../node_modules/mocha/mocha.js"></script>
+ <script src="../node_modules/chai/chai.js"></script>
+ <script>
+ if (window.initMochaPhantomJS) {
+ window.initMochaPhantomJS();
+ }
+ </script>
+
+ <script>
+ var expect = chai.expect;
+ var assert = chai.assert;
+ function cleanupAfterEach() {
+ // Clean up the DOM before each test.
+ // This makes debugging easier than cleaning up after each test, since the
+ // DOM stays on the screen after a failure.
+ beforeEach(function() {
+ var graph = document.getElementById('graph');
+ graph.innerHTML = '';
+ graph.setAttribute('style', '');
+ });
+ }
+ function useProxyCanvas(utils, Proxy) {
+ var _origFunc = utils.getContext;
+ beforeEach(function() {
+ utils.getContext = function(canvas) {
+ return new Proxy(_origFunc(canvas));
+ }
+ });
+
+ afterEach(function() {
+ utils.getContext = _origFunc;
+ });
+ }
+ </script>
+ <script>mocha.setup('bdd')</script>
+
+ <!-- Test data -->
+ <script src="data/data.js"></script>
+
+ <!-- Bundled tests -->
+ <script src="../coverage/tests.js"></script>
+
+ <script>
+ mocha.checkLeaks();
+ if (window.mochaPhantomJS) {
+ mochaPhantomJS.run();
+ } else {
+ mocha.run();
+ }
+ </script>
+</body>
+</html>
+++ /dev/null
-module.exports = function (config) {
- config.set({
- basePath: '../',
- frameworks: [
- 'mocha',
- 'chai'
- ],
- files: [
- 'dist/dygraph-combined-dev.js',
- 'src/extras/smooth-plotter.js',
- 'src/extras/synchronizer.js',
- 'auto_tests/data/*.js',
- 'auto_tests/tests/*.js',
- ],
- autoWatch: false,
- singleRun: true,
- reporters: ['mocha', 'coverage'], // or 'dots', 'mocha', 'spec'
- preprocessors: {
- 'dist/dygraph-combined-dev.js': ['coverage']
- },
- coverageReporter: {
- dir: 'dist/coverage',
- reporters: [
- { type: 'html', subdir: 'report-html' },
- { type: 'lcovonly', subdir: 'report-lcov' },
- ]
- },
- browsers: ['PhantomJS'],
- plugins: [
- 'karma-mocha',
- 'karma-chai-plugins',
- 'karma-phantomjs-launcher',
- 'karma-coverage',
- 'karma-spec-reporter',
- 'karma-mocha-reporter'
- ]
- });
-};
--- /dev/null
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>dygraphs tests</title>
+ <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+</head>
+<body>
+ <div id="graph"></div>
+ <div id="mocha"></div>
+
+ <!-- Polyfills for PhantomJS -->
+ <script src="../node_modules/babel-core/browser-polyfill.js"></script>
+
+ <!-- Mocha -->
+ <script src="../node_modules/mocha/mocha.js"></script>
+ <script src="../node_modules/chai/chai.js"></script>
+ <script>
+ if (window.initMochaPhantomJS) {
+ window.initMochaPhantomJS();
+ }
+ </script>
+
+ <script>
+ var expect = chai.expect;
+ var assert = chai.assert;
+ function cleanupAfterEach() {
+ // Clean up the DOM before each test.
+ // This makes debugging easier than cleaning up after each test, since the
+ // DOM stays on the screen after a failure.
+ beforeEach(function() {
+ var graph = document.getElementById('graph');
+ graph.innerHTML = '';
+ graph.setAttribute('style', '');
+ });
+ }
+ function useProxyCanvas(utils, Proxy) {
+ var _origFunc = utils.getContext;
+ beforeEach(function() {
+ utils.getContext = function(canvas) {
+ return new Proxy(_origFunc(canvas));
+ }
+ });
+
+ afterEach(function() {
+ utils.getContext = _origFunc;
+ });
+ }
+ </script>
+ <script>mocha.setup('bdd')</script>
+
+ <!-- Test data -->
+ <script src="data/data.js"></script>
+
+ <!-- Bundled tests -->
+ <script src="../dist/tests.js"></script>
+
+ <script>
+ mocha.checkLeaks();
+ if (window.mochaPhantomJS) {
+ mochaPhantomJS.run();
+ } else {
+ mocha.run();
+ }
+ </script>
+</body>
+</html>
}
return true;
};
+
+export default CanvasAssertions;
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+import * as utils from '../../src/dygraph-utils';
/**
* @fileoverview Utility functions for Dygraphs.
* type, screenX, screenY, clientX, clientY.
*/
DygraphOps.createOptsForPoint_ = function(g, type, x, y) {
- var pos = Dygraph.findPos(g.canvas_);
+ var pos = utils.findPos(g.canvas_);
var pageX = pos.x + x;
var pageY = pos.y + y;
custom);
};
+
+export default DygraphOps;
};
/**
+ * Convenience wrapper around colorAtPixel if you only care about RGB (not A).
+ * @param {number} x The screen x-coordinate at which to sample.
+ * @param {number} y The screen y-coordinate at which to sample.
+ * @return {Array.<number>} a 3D array: [R, G, B]. All three values
+ * are in [0, 255]. A pixel which has never been touched will be [0,0,0].
+ */
+PixelSampler.prototype.rgbAtPixel = function(x, y) {
+ return this.colorAtPixel(x, y).slice(0, 3);
+};
+
+/**
* The method samples a color using data coordinates (not screen coordinates).
* This will round your data coordinates to the nearest screen pixel before
* sampling.
var dom_xy = this.dygraph_.toDomCoords(x, y);
return this.colorAtPixel(Math.round(dom_xy[0]), Math.round(dom_xy[1]));
};
+
+export default PixelSampler;
Proxy.reset = function(proxy) {
proxy.calls__ = [];
}
+
+export default Proxy;
*
* @author konigsberg@google.com (Robert Konigsberg)
*/
+
+import * as utils from '../../src/dygraph-utils';
+
var Util = {};
/**
/**
* Sample a pixel from the canvas.
* Returns an [r, g, b, a] tuple where each values is in [0, 255].
+ * This is _very_ slow! If you want to sample many pixels, use PixelSampler.
*/
Util.samplePixel = function(canvas, x, y) {
var ctx = canvas.getContext("2d"); // bypasses Proxy if applied.
- // TODO(danvk): Any performance issues with this?
var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
- var scale = Dygraph.getContextPixelRatio(ctx);
+ var scale = utils.getContextPixelRatio(ctx);
var i = 4 * (x * scale + imageData.width * y * scale);
var d = imageData.data;
* @return {string} The date formatted as YYYY-MM-DD.
*/
Util.formatDate = function(dateMillis) {
- return Dygraph.dateString_(dateMillis).slice(0, 10); // 10 == "YYYY/MM/DD".length
+ return utils.dateString_(dateMillis).slice(0, 10); // 10 == "YYYY/MM/DD".length
};
/**
console.error = orig[2];
};
};
+
+export default Util;
*
* @author danvk@google.com (Dan Vanderkam)
*/
-describe("annotations", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import Util from './Util';
-afterEach(function() {
-});
+describe("annotations", function() {
+
+cleanupAfterEach();
it('testAnnotationsDrawn', function() {
var opts = {
+++ /dev/null
-/**
- * @fileoverview Test cases for how axis labels are chosen and formatted,
- * specializing on the deprecated xLabelFormatter, etc.
- *
- * @author dan@dygraphs.com (Dan Vanderkam)
- */
-describe("axis-labels-deprecated", function() {
-
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
-
-afterEach(function() {
-});
-
-it('testDeprecatedDeprecatedXAxisTimeLabelFormatter', function() {
- var opts = {
- width: 480,
- height: 320,
- labels: ['X', 'Y1']
- };
- var data = [[5.0,0],[5.1,1],[5.2,2],[5.3,3],[5.4,4],[5.5,5],[5.6,6],[5.7,7],[5.8,8],[5.9,9]];
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data, opts);
- g.updateOptions({
- axes : {
- x : {
- axisLabelFormatter: function (totalMinutes) {
- var hours = Math.floor( totalMinutes / 60);
- var minutes = Math.floor((totalMinutes - (hours * 60)));
- var seconds = Math.round((totalMinutes * 60) - (hours * 3600) - (minutes * 60));
-
- if (hours < 10) hours = "0" + hours;
- if (minutes < 10) minutes = "0" + minutes;
- if (seconds < 10) seconds = "0" + seconds;
-
- return hours + ':' + minutes + ':' + seconds;
- }
- }
- }
- });
-
- assert.deepEqual(["00:05:00","00:05:12","00:05:24","00:05:36","00:05:48"], Util.getXLabels());
-
- // The legend does not use the xAxisLabelFormatter:
- g.setSelection(1);
- assert.equal('5.1: Y1: 1', Util.getLegend());
-});
-
-it('testDeprecatedAxisLabelFormatter', function() {
- var opts = {
- width: 480,
- height: 320,
- axes : {
- x : {
- axisLabelFormatter: function(x, granularity, opts, dg) {
- assert.equal('number', typeof(x));
- assert.equal('number', typeof(granularity));
- assert.equal('function', typeof(opts));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'x' + x;
- }
- },
- y : {
- axisLabelFormatter: function(y, granularity, opts, dg) {
- assert.equal('number', typeof(y));
- assert.equal('number', typeof(granularity));
- assert.equal('function', typeof(opts));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'y' + y;
- }
- }
- },
- labels: ['x', 'y']
- };
- var data = [];
- for (var i = 0; i < 10; i++) {
- data.push([i, 2 * i]);
- }
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data, opts);
-
- assert.deepEqual(['x0','x2','x4','x6','x8'], Util.getXLabels());
- assert.deepEqual(["y0","y5","y10","y15"], Util.getYLabels());
-
- g.setSelection(2);
- assert.equal("2: y: 4", Util.getLegend());
-});
-
-it('testDeprecatedDateAxisLabelFormatter', function() {
- var opts = {
- width: 480,
- height: 320,
- axes : {
- x : {
- axisLabelFormatter: function(x, granularity, opts, dg) {
- assert.isTrue(Dygraph.isDateLike(x));
- assert.equal('number', typeof(granularity));
- assert.equal('function', typeof(opts));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'x' + Util.formatDate(x);
- },
- pixelsPerLabel: 60
- },
- y : {
- axisLabelFormatter: function(y, granularity, opts, dg) {
- assert.equal('number', typeof(y));
- assert.equal('number', typeof(granularity));
- assert.equal('function', typeof(opts));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'y' + y;
- }
- }
- },
- labels: ['x', 'y']
- };
- var data = [];
- for (var i = 1; i < 10; i++) {
- data.push([new Date("2011/01/0" + i), 2 * i]);
- }
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data, opts);
-
- assert.deepEqual(["x2011/01/02","x2011/01/04","x2011/01/06","x2011/01/08"], Util.getXLabels());
- assert.deepEqual(["y5","y10","y15"], Util.getYLabels());
-
- g.setSelection(0);
- assert.equal("2011/01/01: y: 2", Util.getLegend());
-});
-
-// This test verifies that when a valueFormatter is set (but not an
-// axisLabelFormatter), then the valueFormatter is used to format the axis
-// labels.
-it('testDeprecatedValueFormatter', function() {
- var opts = {
- width: 480,
- height: 320,
- axes : {
- x : {
- valueFormatter: function(x, opts, series_name, dg) {
- assert.equal('number', typeof(x));
- assert.equal('function', typeof(opts));
- assert.equal('string', typeof(series_name));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'x' + x;
- }
- },
- y : {
- valueFormatter: function(y, opts, series_name, dg) {
- assert.equal('number', typeof(y));
- assert.equal('function', typeof(opts));
- assert.equal('string', typeof(series_name));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'y' + y;
- }
- }
- },
- labels: ['x', 'y']
- };
- var data = [];
- for (var i = 0; i < 10; i++) {
- data.push([i, 2 * i]);
- }
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data, opts);
-
- // the valueFormatter options do not affect the ticks.
- assert.deepEqual(['0','2','4','6','8'], Util.getXLabels());
- assert.deepEqual(["0","5","10","15"], Util.getYLabels());
-
- // they do affect the legend, however.
- g.setSelection(2);
- assert.equal("x2: y: y4", Util.getLegend());
-});
-
-it('testDeprecatedDateValueFormatter', function() {
- var opts = {
- width: 480,
- height: 320,
- axes : {
- x : {
- valueFormatter: function(x, opts, series_name, dg) {
- assert.equal('number', typeof(x));
- assert.equal('function', typeof(opts));
- assert.equal('string', typeof(series_name));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'x' + Util.formatDate(x);
- },
- pixelsPerLabel: 60
- },
- y : {
- valueFormatter: function(y, opts, series_name, dg) {
- assert.equal('number', typeof(y));
- assert.equal('function', typeof(opts));
- assert.equal('string', typeof(series_name));
- assert.equal('[Dygraph graph]', dg.toString());
- return 'y' + y;
- }
- }
- },
- labels: ['x', 'y']
- };
-
- var data = [];
- for (var i = 1; i < 10; i++) {
- data.push([new Date("2011/01/0" + i), 2 * i]);
- }
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data, opts);
-
- // valueFormatters do not affect ticks.
- assert.deepEqual(["02 Jan","04 Jan","06 Jan","08 Jan"], Util.getXLabels());
- assert.deepEqual(["5","10","15"], Util.getYLabels());
-
- // the valueFormatter options also affect the legend.
- g.setSelection(2);
- assert.equal('x2011/01/03: y: y6', Util.getLegend());
-});
-
-// This test verifies that when both a valueFormatter and an axisLabelFormatter
-// are specified, the axisLabelFormatter takes precedence.
-it('testDeprecatedAxisLabelFormatterPrecedence', function() {
- var opts = {
- width: 480,
- height: 320,
- axes : {
- x : {
- valueFormatter: function(x) {
- return 'xvf' + x;
- },
- axisLabelFormatter: function(x, granularity) {
- return 'x' + x;
- },
- },
- y : {
- valueFormatter: function(y) {
- return 'yvf' + y;
- },
- axisLabelFormatter: function(y) {
- return 'y' + y;
- },
- }
- },
- labels: ['x', 'y']
- };
- var data = [];
- for (var i = 0; i < 10; i++) {
- data.push([i, 2 * i]);
- }
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data, opts);
-
- assert.deepEqual(['x0','x2','x4','x6','x8'], Util.getXLabels());
- assert.deepEqual(["y0","y5","y10","y15"], Util.getYLabels());
-
- g.setSelection(9);
- assert.equal("xvf9: y: yvf18", Util.getLegend());
-});
-
-// This is the same as the previous test, except that options are added
-// one-by-one.
-it('testDeprecatedAxisLabelFormatterIncremental', function() {
- var opts = {
- width: 480,
- height: 320,
- labels: ['x', 'y']
- };
- var data = [];
- for (var i = 0; i < 10; i++) {
- data.push([i, 2 * i]);
- }
- var graph = document.getElementById("graph");
- var g = new Dygraph(graph, data, opts);
- g.updateOptions({
- axes : {
- x : {
- valueFormatter: function(x) {
- return 'xvf' + x;
- }
- }
- }
- });
- g.updateOptions({
- axes : {
- y : {
- valueFormatter: function(y) {
- return 'yvf' + y;
- }
- }
- }
- });
- g.updateOptions({
- axes : {
- x : {
- axisLabelFormatter: function(x) {
- return 'x' + x;
- }
- }
- }
- });
- g.updateOptions({
- axes : {
- y : {
- axisLabelFormatter: function(y) {
- return 'y' + y;
- }
- }
- }
- });
-
- assert.deepEqual(["x0","x2","x4","x6","x8"], Util.getXLabels());
- assert.deepEqual(["y0","y5","y10","y15"], Util.getYLabels());
-
- g.setSelection(9);
- assert.equal("xvf9: y: yvf18", Util.getLegend());
-});
-
-});
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
-describe("axis-labels", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import DEFAULT_ATTRS from '../../src/dygraph-default-attrs';
+import Util from './Util';
+import {assertDeepCloseTo} from './custom_asserts';
-afterEach(function() {
-});
+describe("axis-labels", function() {
+
+cleanupAfterEach();
var simpleData =
"X,Y,Y2\n" +
x : {
pixelsPerLabel: 60,
axisLabelFormatter : function(x, granularity, opts, dg) {
- assert.isTrue(Dygraph.isDateLike(x));
+ assert.isTrue(utils.isDateLike(x));
assert.equal('number', typeof(granularity));
assert.equal('function', typeof(opts));
assert.equal('[Dygraph graph]', dg.toString());
var g = new Dygraph(graph, simpleData, {});
// Be sure we're dealing with a 14-point default.
- assert.equal(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
+ assert.equal(14, DEFAULT_ATTRS.axisLabelFontSize);
var assertFontSize = function(selector, expected) {
Util.assertStyleOfChildren(selector, "font-size", expected);
};
// Be sure we're dealing with a 14-point default.
- assert.equal(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
+ assert.equal(14, DEFAULT_ATTRS.axisLabelFontSize);
assertFontSize(document.querySelectorAll(".dygraph-axis-label-x"), "14px");
assertFontSize(document.querySelectorAll(".dygraph-axis-label-y"), "14px");
var g = new Dygraph(graph, simpleData, {});
// Be sure we're dealing with a black default.
- assert.equal("black", Dygraph.DEFAULT_ATTRS.axisLabelColor);
+ assert.equal("black", DEFAULT_ATTRS.axisLabelColor);
var assertColor = function(selector, expected) {
Util.assertStyleOfChildren(selector, "color", expected);
}
// Be sure we're dealing with a 14-point default.
- assert.equal(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
+ assert.equal(14, DEFAULT_ATTRS.axisLabelFontSize);
assertColor(document.querySelectorAll(".dygraph-axis-label-x"), "rgb(0, 0, 0)");
assertColor(document.querySelectorAll(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
* @author uemit.seren@gmail.com (Ümit Seren)
*/
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import Util from './Util';
+import DygraphOps from './DygraphOps';
+
describe("callback", function() {
+cleanupAfterEach();
+
var xhr, styleSheet;
+var graph;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div><div id='selection'></div>";
+ var container = document.getElementById('graph');
+ container.innerHTML = "<div id='inner-graph'></div><div id='selection'></div>";
+ graph = container.querySelector('#inner-graph');
xhr = XMLHttpRequest;
styleSheet = document.createElement("style");
styleSheet.type = "text/css";
h_pts = pts;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data,
{
width: 100,
called = true;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, {
drawPointCallback: callback,
});
called = true;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, {
drawPoints: true,
drawPointCallback: callback
count++;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, {
drawPoints: true,
drawPointCallback: callback
assert.equal(g, this);
var dx = g.toDataXCoord(cx);
xvalues.push(dx);
- Dygraph.Circles.DEFAULT.apply(this, arguments);
+ utils.Circles.DEFAULT.apply(this, arguments);
};
- var graph = document.getElementById("graph");
var testdata = [[10, 2], [11, 3], [12, NaN], [13, 2], [14, NaN], [15, 3]];
var graphOpts = {
labels: ['X', 'Y'],
called = true;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data,
{
width: 100,
var h_pts;
var h_series;
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data,
{
width: 600,
h_pts = pts;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, dataNaN,
{
width: 600,
h_pts = pts;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, dataNaN,
{
width: 600,
h_pts = pts;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, dataGap, {
width: 400,
height: 300,
throw "should not reach here";
};
- var graph = document.getElementById("graph");
graph.style.border = "2px solid black";
var g = new Dygraph(graph, "data.csv", { // fake name
width: 400,
highlightRow = row;
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph,
"X,Y,Z\n" +
"0,1,2\n" + // 0
yMax = g.yAxisRange(0)[1];
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, "\n", {
underlayCallback: callback
});
yMax = g.yAxisRange(0)[1];
};
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, "\n", {
valueRange: [0,10],
underlayCallback: callback
var callback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam,idx) {
assert.equal(g, this);
indices.push(idx);
- Dygraph.Circles.DEFAULT.apply(this, arguments);
+ utils.Circles.DEFAULT.apply(this, arguments);
};
- var graph = document.getElementById("graph");
var testdata = [[10, 2], [11, 3], [12, NaN], [13, 2], [14, NaN], [15, 3]];
var graphOpts = {
idxToCheck = idx;
};
var testdata = [[1, 2], [2, 3], [3, NaN], [4, 2], [5, NaN], [6, 3]];
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, testdata, {
drawHighlightPointCallback: drawHighlightPointCallback,
labels: ['X', 'Y']
*
* @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG)
*/
+
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import CanvasAssertions from './CanvasAssertions';
+import Proxy from './Proxy';
+
describe("connect-separated-points", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
-var origFunc = Dygraph.getContext;
+var origFunc = utils.getContext;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
+ utils.getContext = function(canvas) {
return new Proxy(origFunc(canvas));
};
});
* @fileoverview Regression test based on some strange customBars data.
* @author danvk@google.com (Dan Vanderkam)
*/
+
+import Dygraph from '../../src/dygraph';
+
describe("css", function() {
+cleanupAfterEach();
+
var data = "X,Y,Z\n1,2,3\n4,5,6\n";
var styleSheet;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
styleSheet = document.createElement("style");
styleSheet.type = "text/css";
document.getElementsByTagName("head")[0].appendChild(styleSheet);
});
afterEach(function() {
+ styleSheet.innerHTML = '';
});
// Verifies that an unstyled, unsized dygraph gets a default size.
// Verifies that a CSS percentage size works.
it('testPercentageSize', function() {
- document.body.innerHTML =
+ var testdiv = document.getElementById("graph");
+ testdiv.innerHTML =
'<div style="width: 600px; height: 400px;">' +
- '<div id="graph"></div></div>';
+ '<div id="inner-graph"></div></div>';
var opts = {
};
- var graph = document.getElementById("graph");
+ var graph = document.getElementById("inner-graph");
graph.style.width = '50%';
graph.style.height = '50%';
// An invisible chart div shouldn't produce an error.
it('testInvisibleChart', function() {
- document.body.innerHTML =
+ graph.innerHTML =
'<div style="display:none;">' +
- '<div id="graph" style="width: 640px; height: 480px;"></div>' +
+ '<div id="inner-graph" style="width: 640px; height: 480px;"></div>' +
'</div>';
- var graph = document.getElementById("graph");
- new Dygraph(graph, data, {});
+ new Dygraph('inner-graph', data, {});
});
// An invisible chart div shouldn't produce an error.
it('testInvisibleChartDate', function() {
- document.body.innerHTML =
+ graph.innerHTML =
'<div style="display:none;">' +
- '<div id="graph" style="width: 640px; height: 480px;"></div>' +
+ '<div id="inner-graph" style="width: 640px; height: 480px;"></div>' +
'</div>';
- var graph = document.getElementById("graph");
- new Dygraph(graph,
+ new Dygraph('inner-graph',
"Date,Y\n" +
"2010/01/01,100\n" +
"2010/02/01,200\n" +
// An invisible chart div that becomes visible.
it('testInvisibleThenVisibleChart', function() {
- document.body.innerHTML =
+ var testdiv = document.getElementById("graph");
+ testdiv.innerHTML =
'<div id="x" style="display:none;">' +
- '<div id="graph" style="width: 640px; height: 480px;"></div>' +
+ '<div id="inner-graph" style="width: 640px; height: 480px;"></div>' +
'</div>';
- var graph = document.getElementById("graph");
+ var graph = document.getElementById("inner-graph");
var g = new Dygraph(graph,
"Date,Y\n" +
"2010/01/01,100\n" +
* @fileoverview Assertions that chai doesn't provide out of the box.
*/
-var assertDeepCloseTo = function(actualArray, expectedArray, epsilon) {
+export function assertDeepCloseTo(actualArray, expectedArray, epsilon) {
assert.isArray(actualArray);
assert.isArray(expectedArray);
for (var i = 0; i < actualArray.length; i++) {
* @fileoverview Regression test based on some strange customBars data.
* @author danvk@google.com (Dan Vanderkam)
*/
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import CanvasAssertions from './CanvasAssertions';
+import PixelSampler from './PixelSampler';
+import Proxy from './Proxy';
+
describe("custom-bars", function() {
-var _origFunc = Dygraph.getContext;
+cleanupAfterEach();
+
+var _origFunc = utils.getContext;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
+ utils.getContext = function(canvas) {
return new Proxy(_origFunc(canvas));
}
});
afterEach(function() {
- Dygraph.getContext = _origFunc;
+ utils.getContext = _origFunc;
});
// This test used to reliably produce an infinite loop.
*
* @author danvdk@gmail.com (Dan Vanderkam)
*/
+import Dygraph from '../../src/dygraph';
describe("data-api", function() {
+cleanupAfterEach();
+
var opts, graphDiv;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
opts = {
width: 480,
height: 320
graphDiv = document.getElementById("graph");
});
-afterEach(function() {
-});
-
it('testBasicAccessors', function() {
var g = new Dygraph(graphDiv, temperature_data, opts);
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
-describe("date-formats", function() {
-beforeEach(function() {
-});
+import * as utils from '../../src/dygraph-utils';
-afterEach(function() {
-});
+describe("date-formats", function() {
it('testISO8601', function() {
// Format: YYYY-MM-DDTHH:MM:SS.ddddddZ
// Firefox <4 does not support this format:
// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/parse
if (navigator.userAgent.indexOf("Firefox/3.5") == -1) {
- assert.equal(946816496789, Dygraph.dateParser("2000-01-02T12:34:56.789012Z"));
+ assert.equal(946816496789, utils.dateParser("2000-01-02T12:34:56.789012Z"));
}
});
zp(d.getDate()) + ' ' +
zp(d.getHours()) + ':' +
zp(d.getMinutes());
- assert.equal(Date.UTC(2000, 1, 2), Dygraph.dateParser(str));
+ assert.equal(Date.UTC(2000, 1, 2), utils.dateParser(str));
});
});
* @author danvdk@gmail.com (Dan Vanderkam)
*/
+import * as DygraphTickers from '../../src/dygraph-tickers';
+import DEFAULT_ATTRS from '../../src/dygraph-default-attrs';
+
describe("date-ticker-tests", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
var createOptionsViewForAxis = function(axis, dict) {
return function (x) {
if (dict && dict.hasOwnProperty(x)) {
return dict[x];
}
- if (Dygraph.DEFAULT_ATTRS.axes[axis].hasOwnProperty(x)) {
- return Dygraph.DEFAULT_ATTRS.axes[axis][x];
+ if (DEFAULT_ATTRS.axes[axis].hasOwnProperty(x)) {
+ return DEFAULT_ATTRS.axes[axis][x];
}
- if (Dygraph.DEFAULT_ATTRS.hasOwnProperty(x)) {
- return Dygraph.DEFAULT_ATTRS[x];
+ if (DEFAULT_ATTRS.hasOwnProperty(x)) {
+ return DEFAULT_ATTRS[x];
}
if (x == 'axisLabelFormatter') return null;
throw "mysterious " + axis + "-axis option: " + x;
var opts = {labelsUTC: true};
var options = createOptionsViewForAxis('x', opts);
- var ticks = Dygraph.dateTicker(-1797534000000, 1255579200000, 800, options);
+ var ticks = DygraphTickers.dateTicker(-1797534000000, 1255579200000, 800, options);
var expected_ticks = [
{"v":-1577923200000,"label":"1920"},
{"v":-1262304000000,"label":"1930"},
var start = Date.UTC(1999, 11, 31, 14, 0, 0);
var end = Date.UTC(2000, 0, 1, 12, 0, 0);
- var granularity = Dygraph.TWO_HOURLY;
- ticks = Dygraph.getDateAxis(start, end, granularity, options);
+ var granularity = DygraphTickers.Granularity.TWO_HOURLY;
+ ticks = DygraphTickers.getDateAxis(start, end, granularity, options);
changeNbspToSpace(ticks);
expected_ticks = [ // months of the year are zero-based.
{v: Date.UTC(1999, 11, 31, 14, 0, 0), label: '14:00'},
// In these tests, those spurious ticks are removed to test new behavior.
var ticker = function() {
- var ticks = Dygraph.dateTicker.apply(null, arguments);
+ var ticks = DygraphTickers.dateTicker.apply(null, arguments);
changeNbspToSpace(ticks);
return ticks;
};
/**
* @fileoverview Test cases for DygraphOptions.
*/
+
+import Dygraph from '../../src/dygraph';
+import DygraphOptions from '../../src/dygraph-options';
+import OPTIONS_REFERENCE from '../../src/dygraph-options-reference';
+
describe("dygraph-options-tests", function() {
+cleanupAfterEach();
+
var graph;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
graph = document.getElementById("graph");
});
-afterEach(function() {
-});
-
/*
* Pathalogical test to ensure getSeriesNames works
*/
};
it('testLogWarningForNonexistentOption', function() {
- if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') {
+ if (!OPTIONS_REFERENCE) {
return; // this test won't pass in non-debug mode.
}
});
it('testOnlyLogsEachWarningOnce', function() {
- if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') {
+ if (!OPTIONS_REFERENCE) {
return; // this test won't pass in non-debug mode.
}
*
* @author danvk@google.com (Dan Vanderkam)
*/
-describe("error-bars", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import Util from './Util';
+import Proxy from './Proxy';
+import CanvasAssertions from './CanvasAssertions';
-var _origFunc = Dygraph.getContext;
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(_origFunc(canvas));
- }
-});
+describe("error-bars", function() {
-afterEach(function() {
- Dygraph.getContext = _origFunc;
-});
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
it('testErrorBarsDrawn', function() {
var opts = {
*
* @author danvdk@gmail.com (Dan Vanderkam)
*/
-describe("fast-canvas-proxy", function() {
-beforeEach(function() {
-});
+import DygraphCanvasRenderer from '../../src/dygraph-canvas';
+import Proxy from './Proxy';
-afterEach(function() {
-});
+describe("fast-canvas-proxy", function() {
var fakeCanvasContext = {
moveTo: function() {},
*
* @author benoitboivin.pro@gmail.com (Benoit Boivin)
*/
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import CanvasAssertions from './CanvasAssertions';
+import Proxy from './Proxy';
+
describe("fill-step-plot", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
-var origFunc = Dygraph.getContext;
+var origFunc = utils.getContext;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
+ utils.getContext = function(canvas) {
return new Proxy(origFunc(canvas));
};
});
afterEach(function() {
- Dygraph.getContext = origFunc;
+ utils.getContext = origFunc;
});
*
* @author konigsberg@google.com (Robert Konigsberg)
*/
-describe("formats", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
-afterEach(function() {
-});
+describe("formats", function() {
+
+cleanupAfterEach();
var dataString =
"X,Y\n" +
*
* @author david.eberlein@ch.sauter-bc.com (Fr. Sauter AG)
*/
-describe("grid-per-axis", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
-var origFunc = Dygraph.getContext;
+import Proxy from './Proxy';
+import CanvasAssertions from './CanvasAssertions';
+import Util from './Util';
+import PixelSampler from './PixelSampler';
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(origFunc(canvas));
- };
-});
+describe("grid-per-axis", function() {
-afterEach(function() {
- Dygraph.getContext = origFunc;
-});
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
it('testIndependentGrids', function() {
var opts = {
}
var x, y;
x = halfUp(g.plotter_.area.x);
+ var sampler = new PixelSampler(g);
// Step through y(0) and y2(1) axis
for ( var axis = 0; axis < 2; axis++) {
// Step through all gridlines of the axis
for ( var i = 0; i < gridlines[axis].length; i++) {
y = halfDown(g.toDomYCoord(gridlines[axis][i], axis));
// Check the grid colors.
- assert.deepEqual(gridColors[axis], Util.samplePixel(g.hidden_, x, y),
+ assert.deepEqual(gridColors[axis], sampler.colorAtPixel(x, y),
"Unexpected grid color found at pixel: x: " + x + "y: " + y);
}
}
});
+
it('testPerAxisGridWidth', function() {
var opts = {
width : 480,
}
var x, y;
x = halfUp(g.plotter_.area.x + 10);
+
+ var sampler = new PixelSampler(g);
// Step through y(0) and y2(1) axis
for ( var axis = 0; axis < 2; axis++) {
// Step through all gridlines of the axis
// Ignore the alpha value
// FIXME(pholden): this test fails with a context pixel ratio of 2.
- var drawnPixeldown2 = Util.samplePixel(g.hidden_, x, y - 2).slice(0, 3);
- var drawnPixeldown1 = Util.samplePixel(g.hidden_, x, y - 1).slice(0, 3);
- var drawnPixel = Util.samplePixel(g.hidden_, x, y).slice(0, 3);
- var drawnPixelup1 = Util.samplePixel(g.hidden_, x, y + 1).slice(0, 3);
- var drawnPixelup2 = Util.samplePixel(g.hidden_, x, y + 2).slice(0, 3);
+ var drawnPixeldown2 = sampler.rgbAtPixel(x, y - 2);
+ var drawnPixeldown1 = sampler.rgbAtPixel(x, y - 1);
+ var drawnPixel = sampler.rgbAtPixel(x, y);
+ var drawnPixelup1 = sampler.rgbAtPixel(x, y + 1);
+ var drawnPixelup2 = sampler.rgbAtPixel(x, y + 2);
// Check the grid width.
switch (axis) {
case 0: // y with 2 pixels width
y = halfDown(g.plotter_.area.y) + 10;
for ( var i = 0; i < xGridlines.length; i++) {
x = halfUp(g.toDomXCoord(xGridlines[i]));
- assert.deepEqual(emptyColor, Util.samplePixel(g.hidden_, x - 4, y).slice(0, 3),
+ assert.deepEqual(emptyColor, sampler.rgbAtPixel(x - 4, y),
"Unexpected x-grid color found at pixel: x: " + x + "y: " + y);
- assert.deepEqual(gridColor, Util.samplePixel(g.hidden_, x - 3, y).slice(0, 3),
+ assert.deepEqual(gridColor, sampler.rgbAtPixel(x - 3, y),
"Unexpected x-grid color found at pixel: x: " + x + "y: " + y);
- assert.deepEqual(gridColor, Util.samplePixel(g.hidden_, x - 2, y).slice(0, 3),
+ assert.deepEqual(gridColor, sampler.rgbAtPixel(x - 2, y),
"Unexpected x-grid color found at pixel: x: " + x + "y: " + y);
- assert.deepEqual(gridColor, Util.samplePixel(g.hidden_, x - 1, y).slice(0, 3),
+ assert.deepEqual(gridColor, sampler.rgbAtPixel(x - 1, y),
"Unexpected x-grid color found at pixel: x: " + x + "y: " + y);
- assert.deepEqual(gridColor, Util.samplePixel(g.hidden_, x, y).slice(0, 3),
+ assert.deepEqual(gridColor, sampler.rgbAtPixel(x, y),
"Unexpected x-grid color found at pixel: x: " + x + "y: " + y);
- assert.deepEqual(gridColor, Util.samplePixel(g.hidden_, x + 1, y).slice(0, 3),
+ assert.deepEqual(gridColor, sampler.rgbAtPixel(x + 1, y),
"Unexpected x-grid color found at pixel: x: " + x + "y: " + y);
- assert.deepEqual(emptyColor, Util.samplePixel(g.hidden_, x + 2, y).slice(0, 3),
+ assert.deepEqual(emptyColor, sampler.rgbAtPixel(x + 2, y),
"Unexpected x-grid color found at pixel: x: " + x + "y: " + y);
}
});
+// PhantomJS 1.9.x does not support setLineDash
+// When Travis-CI updates to Phantom2, this can be re-enabled.
+// See https://github.com/ariya/phantomjs/issues/12948
+if (!navigator.userAgent.match(/PhantomJS\/1.9/)) {
it('testGridLinePattern', function() {
var opts = {
- width : 120,
+ width : 480,
height : 320,
errorBars : false,
labels : [ "X", "Left", "Right" ],
return Math.round(y) - 1;
}
var x, y;
+ var sampler = new PixelSampler(g);
// Step through all gridlines of the axis
for (var i = 0; i < yGridlines.length; i++) {
y = halfDown(g.toDomYCoord(yGridlines[i], 0));
// avoid checking the edge pixels since they differ depending on the OS.
var pixelpos = x % 10;
if(pixelpos < 1 || pixelpos > 8) continue;
+
+ // XXX: check what this looks like at master
// Ignore alpha
- var drawnPixel = Util.samplePixel(g.hidden_, x, y).slice(0,3);
+ var drawnPixel = sampler.rgbAtPixel(x, y);
var pattern = (Math.floor((x) / 10)) % 2;
switch (pattern) {
case 0: // fill
}
}
});
+}
});
* Unit tests for GViz data table support.
*/
-describe('gviz', function() {
+import Dygraph from '../../src/dygraph';
- beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- });
+import Util from './Util';
- afterEach(function() {
- });
+describe('gviz', function() {
+
+ cleanupAfterEach();
// This is a fake version of the gviz DataTable API, which can only be
// sourced using the google js loader.
*
* @author danvdk@gmail.com (Dan Vanderkam)
*/
+
+import Dygraph from '../../src/dygraph';
+
describe("hidpi", function() {
+cleanupAfterEach();
+
var savePixelRatio;
beforeEach(function() {
savePixelRatio = window.devicePixelRatio;
window.devicePixelRatio = 2;
-
- document.body.innerHTML = "<div id='graph'></div>";
});
afterEach(function() {
*
* @author konigsberg@google.com (Robert Konigsbrg)
*/
-describe("interaction-model", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import DygraphInteraction from '../../src/dygraph-interaction-model';
+import DygraphOps from './DygraphOps';
-afterEach(function() {
-});
+describe("interaction-model", function() {
+
+cleanupAfterEach();
var data1 = "X,Y\n" +
"20,-1\n" +
function customDown(event, g, context) {
context.initializeMouseDown(event, g, context);
- Dygraph.startPan(event, g, context);
+ DygraphInteraction.startPan(event, g, context);
}
function customMove(event, g, context) {
- Dygraph.movePan(event, g, context);
+ DygraphInteraction.movePan(event, g, context);
}
function customUp(event, g, context) {
- Dygraph.endPan(event, g, context);
+ DygraphInteraction.endPan(event, g, context);
}
var opts = {
width: 100,
height : 100,
clickCallback : clickCallback,
- interactionModel : Dygraph.Interaction.nonInteractiveModel_
+ interactionModel : DygraphInteraction.nonInteractiveModel_
};
var graph = document.getElementById("graph");
*
* @author konigsberg@google.com (Robert Konigsberg)
*/
+
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import Proxy from './Proxy';
+import CanvasAssertions from './CanvasAssertions';
+import Util from './Util';
+
var ZERO_TO_FIFTY = [[ 10, 0 ] , [ 20, 50 ]];
describe("missing-points", function() {
-var _origFunc = Dygraph.getContext;
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(_origFunc(canvas));
- }
-});
-
-afterEach(function() {
- Dygraph.getContext = _origFunc;
-});
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
it('testSeparatedPointsDontDraw', function() {
var graph = document.getElementById("graph");
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
-describe("multi-csv", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
-afterEach(function() {
-});
+describe("multi-csv", function() {
+
+cleanupAfterEach();
function getXLabels() {
var x_labels = document.getElementsByClassName("dygraph-axis-label-x");
* @author danvdk@gmail.com (Dan Vanderkam)
*/
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import Util from './Util';
+
describe("multiple-axes-tests", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
var getData = function() {
var data = [];
var results = { y : {}, y2 : {}};
var firstCallback = function(g, seriesName, ctx, canvasx, canvasy, color, radius) {
results.y[seriesName] = 1;
- Dygraph.Circles.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius);
+ utils.Circles.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius);
};
var secondCallback = function(g, seriesName, ctx, canvasx, canvasy, color, radius) {
results.y2[seriesName] = 1;
- Dygraph.Circles.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius);
+ utils.Circles.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius);
};
var g = new Dygraph(
*
* @author danvk@google.com (Dan Vanderkam)
*/
-describe("no-hours", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import Util from './Util';
-afterEach(function() {
-});
+describe("no-hours", function() {
+
+cleanupAfterEach();
it('testNoHours', function() {
var opts = {
* @author danvdk@gmail.com (Dan Vanderkam)
*/
+import Dygraph from '../../src/dygraph';
+import * as DygraphTickers from '../../src/dygraph-tickers';
+import DEFAULT_ATTRS from '../../src/dygraph-default-attrs';
+
describe("numeric-ticker-tests", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
var createOptionsViewForAxis = function(axis, dict) {
return function (x) {
if (dict && dict.hasOwnProperty(x)) {
return dict[x];
}
- if (Dygraph.DEFAULT_ATTRS.axes[axis].hasOwnProperty(x)) {
- return Dygraph.DEFAULT_ATTRS.axes[axis][x];
+ if (DEFAULT_ATTRS.axes[axis].hasOwnProperty(x)) {
+ return DEFAULT_ATTRS.axes[axis][x];
}
- if (Dygraph.DEFAULT_ATTRS.hasOwnProperty(x)) {
- return Dygraph.DEFAULT_ATTRS[x];
+ if (DEFAULT_ATTRS.hasOwnProperty(x)) {
+ return DEFAULT_ATTRS[x];
}
if (x == 'axisLabelFormatter') return null;
throw "mysterious " + axis + "-axis option: " + x;
var opts = {"logscale":null,"labelsKMG2":false,"labelsKMB":false};
var options = createOptionsViewForAxis('y', opts);
- var ticks = Dygraph.numericTicks(-0.4, 4.4, 320, options);
+ var ticks = DygraphTickers.numericTicks(-0.4, 4.4, 320, options);
var expected_ticks = [
{"v":-0.5,"label":"-0.5"},
{"v":0,"label":"0"},
{"v":4.5,"label":"4.5"}];
assert.deepEqual(expected_ticks, ticks);
- ticks = Dygraph.numericTicks(1, 84, 540, options);
+ ticks = DygraphTickers.numericTicks(1, 84, 540, options);
var expected_ticks = [
{"v":0,"label":"0"},
{"v":5,"label":"5"},
*
* @author danvk@google.com (Dan Vanderkam)
*/
-describe("parser", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
-afterEach(function() {
-});
+describe("parser", function() {
+
+cleanupAfterEach();
it('testDetectLineDelimiter', function() {
var data = "X,Y\r" +
"2,1\r" +
"3,0\r"
;
- assert.equal("\r", Dygraph.detectLineDelimiter(data));
+ assert.equal("\r", utils.detectLineDelimiter(data));
data = "X,Y\n" +
"0,-1\n" +
"2,1\n" +
"3,0\n"
;
- assert.equal("\n", Dygraph.detectLineDelimiter(data));
+ assert.equal("\n", utils.detectLineDelimiter(data));
data = "X,Y\n\r" +
"0,-1\n\r" +
"2,1\n\r" +
"3,0\n\r"
;
- assert.equal("\n\r", Dygraph.detectLineDelimiter(data));
+ assert.equal("\n\r", utils.detectLineDelimiter(data));
});
it('testParseDosNewlines', function() {
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
+
+import Dygraph from '../../src/dygraph';
+import Util from './Util';
+
describe("pathological-cases", function() {
+cleanupAfterEach();
+
var restoreConsole;
var logs = {};
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
restoreConsole = Util.captureConsole(logs);
});
restoreConsole();
});
+var graph = document.getElementById("graph");
+
it('testZeroPoint', function() {
var opts = {
width: 480,
};
var data = "X,Y\n";
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
});
var data = "X,Y\n" +
"1,2\n";
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
});
var h = document.createElement('h3');
h.appendChild(document.createTextNode(baseName + ' ' + variantName));
- document.body.appendChild(h);
+ graph.appendChild(h);
for (var dataName in dataSets) {
var data = dataSets[dataName];
var gdiv = document.createElement('div');
gdiv.style.display = 'inline-block';
box.appendChild(gdiv);
- document.body.appendChild(box);
+ graph.appendChild(box);
var cols = data && data[0] ? data[0].length : 0;
opts.labels = ['X', 'A', 'B', 'C'].slice(0, cols);
var data = "X,Y\n" +
"1,2\n";
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
});
*
* @author konigsberg@google.com (Robert Konigsberg)
*/
+
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+
+import Util from './Util';
+import CanvasAssertions from './CanvasAssertions';
+import Proxy from './Proxy';
+
describe("per-axis", function() {
-var _origGetContext = Dygraph.getContext;
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
var xAxisLineColor = "#00ffff";
var yAxisLineColor = "#ffff00";
var g, graph;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(_origGetContext(canvas));
- }
-
var opts = {
axes : {
x : {
g = new Dygraph(graph, data, opts);
});
-afterEach(function() {
- Dygraph.getContext = _origGetContext;
-});
-
it('testDrawXAxis', function() {
g.updateOptions({ axes : { x : { drawAxis: true }} });
assert.isTrue(graph.getElementsByClassName('dygraph-axis-label-x').length > 0);
*
* @author danvk@google.com (Dan Vanderkam)
*/
-describe("per-series", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
-afterEach(function() {
-});
+import PixelSampler from './PixelSampler';
+
+describe("per-series", function() {
+
+cleanupAfterEach();
it('testPerSeriesFill', function() {
var opts = {
*
* @author konigsberg@google.com (Robert Konigsberg)
*/
+
+import Dygraph from '../../src/dygraph';
+import DygraphOps from './DygraphOps';
+
describe("plugins", function() {
+cleanupAfterEach();
+
var data;
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-
data = "X,Y1,Y2\n" +
"0,1,2\n" +
"1,2,1\n" +
;
});
-afterEach(function() {
-});
-
it('testWillDrawChart', function() {
var draw = 0;
+import Dygraph from '../../src/dygraph';
+import LegendPlugin from '../../src/plugins/legend';
+import Util from './Util';
+
describe("plugins-legend", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div><div id='label'></div>";
-});
+var graph;
-afterEach(function() {
+cleanupAfterEach();
+beforeEach(function() {
+ var testDiv = document.getElementById('graph');
+ testDiv.innerHTML = "<div id='inner-graph'></div><div id='label'></div>";
+ graph = document.getElementById('inner-graph');
});
it('testLegendEscape', function() {
"3,0\n"
;
- var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- var legendPlugin = new Dygraph.Plugins.Legend();
+ var legendPlugin = new LegendPlugin();
legendPlugin.activate(g);
var e = {
selectedX: 'selectedX',
it('should let labelsDiv be a string', function() {
var labelsDiv = document.getElementById('label');
- var g = new Dygraph('graph', 'X,Y\n1,2\n', {labelsDiv: 'label'});
+ var g = new Dygraph(graph, 'X,Y\n1,2\n', {labelsDiv: 'label'});
null
g.setSelection(0);
assert.equal('1: Y: 2', Util.nbspToSpace(labelsDiv.textContent));
it('should let labelsDiv be an Element', function() {
var labelsDiv = document.getElementById('label');
- var g = new Dygraph('graph', 'X,Y\n1,2\n', { labelsDiv: labelsDiv });
+ var g = new Dygraph(graph, 'X,Y\n1,2\n', { labelsDiv: labelsDiv });
assert.isNull(labelsDiv.getAttribute('class')); // dygraph-legend not added.
g.setSelection(0);
assert.equal('1: Y: 2', Util.nbspToSpace(labelsDiv.textContent));
});
it('should render dashed patterns', function() {
- var g = new Dygraph('graph', 'X,Y\n1,2\n', {
+ var g = new Dygraph(graph, 'X,Y\n1,2\n', {
strokePattern: [5, 5],
color: 'red',
legend: 'always'
* @fileoverview Regression tests for range selector.
* @author paul.eric.felix@gmail.com (Paul Felix)
*/
+
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
+import RangeSelectorPlugin from '../../src/plugins/range-selector';
+
+import Util from './Util';
+import DygraphOps from './DygraphOps';
+import CanvasAssertions from './CanvasAssertions';
+import Proxy from './Proxy';
+
describe("range-selector", function() {
+cleanupAfterEach();
+
var restoreConsole;
var logs = {};
beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
restoreConsole = Util.captureConsole(logs);
});
it('testMiniPlotDrawn', function() {
// Install Proxy to track canvas calls.
- var origFunc = Dygraph.getContext;
+ var origFunc = utils.getContext;
var miniHtx;
- Dygraph.getContext = function(canvas) {
+ utils.getContext = function(canvas) {
if (canvas.className != 'dygraph-rangesel-bgcanvas') {
return origFunc(canvas);
}
assert.isNotNull(miniHtx);
assert.isTrue(0 < CanvasAssertions.numLinesDrawn(miniHtx, '#ff0000'));
- Dygraph.getContext = origFunc;
+ utils.getContext = origFunc;
});
// Tests data computation for the mini plot with a single series.
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- var rangeSelector = g.getPluginInstance_(Dygraph.Plugins.RangeSelector);
+ var rangeSelector = g.getPluginInstance_(RangeSelectorPlugin);
assert.isNotNull(rangeSelector);
var combinedSeries = rangeSelector.computeCombinedSeriesAndLimits_();
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- var rangeSelector = g.getPluginInstance_(Dygraph.Plugins.RangeSelector);
+ var rangeSelector = g.getPluginInstance_(RangeSelectorPlugin);
assert.isNotNull(rangeSelector);
var combinedSeries = rangeSelector.computeCombinedSeriesAndLimits_();
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- var rangeSelector = g.getPluginInstance_(Dygraph.Plugins.RangeSelector);
+ var rangeSelector = g.getPluginInstance_(RangeSelectorPlugin);
assert.isNotNull(rangeSelector);
var combinedSeries = rangeSelector.computeCombinedSeriesAndLimits_();
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- var rangeSelector = g.getPluginInstance_(Dygraph.Plugins.RangeSelector);
+ var rangeSelector = g.getPluginInstance_(RangeSelectorPlugin);
assert.isNotNull(rangeSelector);
var combinedSeries = rangeSelector.computeCombinedSeriesAndLimits_();
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- var rangeSelector = g.getPluginInstance_(Dygraph.Plugins.RangeSelector);
+ var rangeSelector = g.getPluginInstance_(RangeSelectorPlugin);
assert.isNotNull(rangeSelector);
var combinedSeries = rangeSelector.computeCombinedSeriesAndLimits_();
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- var rangeSelector = g.getPluginInstance_(Dygraph.Plugins.RangeSelector);
+ var rangeSelector = g.getPluginInstance_(RangeSelectorPlugin);
assert.isNotNull(rangeSelector);
var combinedSeries = rangeSelector.computeCombinedSeriesAndLimits_();
*
* @author konigsberg@google.com (Robert Konigsberg)
*/
+
+import Dygraph from '../../src/dygraph';
+
+import DygraphOps from './DygraphOps';
+import {assertDeepCloseTo} from './custom_asserts';
+
var ZERO_TO_FIFTY = [[ 10, 0 ] , [ 20, 50 ]];
var ZERO_TO_FIFTY_STEPS = (function() {
var a = [];
describe("range-tests", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
var createGraph = function(opts, data, expectRangeX, expectRangeY) {
if (data === undefined) data = ZERO_TO_FIFTY_STEPS;
*
* @author konigsberg@google.com (Robert Konigsberg)
*/
+
+import Dygraph from '../../src/dygraph';
+
+import DygraphOps from './DygraphOps';
+import Util from './Util';
+
describe("resize", function() {
+cleanupAfterEach();
+
var data =
"X,Y\n" +
"1,100\n" +
"5,300\n" +
"6,100\n";
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
-
-afterEach(function() {
-});
-
it('testResizeMaintainsMouseOperations', function() {
- document.body.innerHTML =
- '<div id="graph" style="width: 640px; height: 480px;"></div>' +
- '</div>';
- var graph = document.getElementById("graph");
+ var graph = document.getElementById('graph');
+ graph.setAttribute('style', 'width: 640px; height: 480px;');
var callbackCount = 0;
var callback = function() {
strum(g, 300, 640);
assert.equal(6, callbackCount);
- document.getElementById("graph").style.width = "500px";
+ graph.style.width = "500px";
g.resize();
callbackCount = 0;
*
* @author danvk@google.com (Dan Vanderkam)
*/
-describe("rolling-average", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
-afterEach(function() {
-});
+import Util from './Util';
+
+describe("rolling-average", function() {
+
+cleanupAfterEach();
it('testRollingAverage', function() {
var opts = {
* @author konigsberg@google.com (Robert Konigsberg)
*/
+import Dygraph from '../../src/dygraph';
+
describe("dygraphs-sanity", function() {
var DEAD_SIMPLE_DATA = 'X,Y\n10,2100';
var ZERO_TO_FIFTY = 'X,Y\n10,0\n20,50';
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
/**
* The sanity test of sanity tests.
*
* @author danvk@google.com (Dan Vanderkam)
*/
-describe("scientific-notation", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import {assertDeepCloseTo} from './custom_asserts';
-afterEach(function() {
-});
+describe("scientific-notation", function() {
+
+cleanupAfterEach();
function getXValues(g) {
var xs = [];
*
* @author konigsberg@google.com (Robert Konigsbrg)
*/
+
+import Dygraph from '../../src/dygraph';
+import DygraphOps from './DygraphOps';
+
describe("scrolling-div", function() {
var point, g;
"non proident, sunt in culpa qui officia deserunt mollit anim id est\n" +
"laborum.</p>";
- document.body.innerHTML =
+ var testDiv = document.getElementById('graph');
+ testDiv.innerHTML =
"<div id='scroller' style='overflow: scroll; height: 450px; width: 800px;'>" +
- "<div id='graph'></div>" +
+ "<div id='graph-inner'></div>" +
"<div style='height:100px; background-color:green;'>" + LOREM_IPSUM + " </div>" +
"<div style='height:100px; background-color:red;'>" + LOREM_IPSUM + "</div>" +
"</div>";
+ // The old test runner had an 8px margin on the body
+ // The Mocha test runner does not. We set it on the test div to keep the
+ // coordinates the same.
+ testDiv.style.margin = '8px';
+
var data = [
[ 10, 1 ],
[ 20, 3 ],
[ 70, 4 ],
[ 80, 6 ] ];
- var graph = document.getElementById("graph");
+ var graph = document.getElementById("graph-inner");
point = null;
g = new Dygraph(graph, data,
return scrollbarWidth;
};
-afterEach(function() {
-});
-
/**
* This tests that when the nested div is unscrolled, things work normally.
*/
* @author danvk@google.com (Dan Vanderkam)
*/
+import Dygraph from '../../src/dygraph';
+import DefaultHandler from '../../src/datahandler/default';
+
describe("selection", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+cleanupAfterEach();
it('testSetGetSelection', function() {
var graph = document.getElementById("graph");
it('testSetGetSelectionMissingPoints', function() {
var dataHandler = function() {};
- dataHandler.prototype = new Dygraph.DataHandlers.DefaultHandler();
+ dataHandler.prototype = new DefaultHandler();
dataHandler.prototype.seriesToPoints = function(series, setName, boundaryIdStart) {
var val = null;
if (setName == 'A') {
* @author konigsberg@google.com (Robert Konigsberg)
*/
-describe("simple-drawing", function() {
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
-var ZERO_TO_FIFTY = 'X,Y\n10,0\n20,50';
+import CanvasAssertions from './CanvasAssertions';
+import Proxy from './Proxy';
+import PixelSampler from './PixelSampler';
-var _origFunc = Dygraph.getContext;
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(_origFunc(canvas));
- }
-});
+describe("simple-drawing", function() {
-afterEach(function() {
- Dygraph.getContext = _origFunc;
-});
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
+
+var ZERO_TO_FIFTY = 'X,Y\n10,0\n20,50';
it('testDrawSimpleRangePlusOne', function() {
var opts = {
*
* @author danvdk@gmail.com (Dan Vanderkam)
*/
+
+import Dygraph from '../../src/dygraph';
+import '../../src/extras/smooth-plotter'; // defines Dygraph.smoothPlotter
+
describe("smooth-plotter", function() {
+var smoothPlotter = Dygraph.smoothPlotter;
var getControlPoints = smoothPlotter._getControlPoints;
beforeEach(function() {
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
-describe("stacked", function() {
-var _origGetContext = Dygraph.getContext;
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(_origGetContext(canvas));
- }
-});
+import Proxy from './Proxy';
+import CanvasAssertions from './CanvasAssertions';
+import Util from './Util';
-afterEach(function() {
- Dygraph.getContext = _origGetContext;
-});
+describe("stacked", function() {
+
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
it('testCorrectColors', function() {
var opts = {
*
* @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG)
*/
-describe("step-plot-per-series", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
-var origFunc = Dygraph.getContext;
+import Proxy from './Proxy';
+import CanvasAssertions from './CanvasAssertions';
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(origFunc(canvas));
- };
-});
+describe("step-plot-per-series", function() {
-afterEach(function() {
- Dygraph.getContext = origFunc;
-});
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
it('testMixedModeStepAndLineFilled', function() {
var opts = {
*
* @author nyx@nyx.cz (Marek Janda)
*/
+
+import Dygraph from '../../src/dygraph';
+import '../../src/extras/synchronizer'; // Sets Dygraph.synchronize
+
+import DygraphOps from './DygraphOps';
+
describe("synchronize", function() {
var gs;
var originalCallbackCalled;
"12,1,4,2\n" +
"13,0,2,3\n";
var h_row, h_pts;
+ var graph = document.getElementById('graph');
beforeEach(function() {
-
document.body.innerHTML = "<div id='graph1'></div><div id='graph2'></div>";
+
graph.innerHTML = "<div id='graph1'></div><div id='graph2'></div>";
originalCallbackCalled = false;
h_row = 0, h_pts = [];
gs = [];
*
* @author danvk@google.com (Dan Vanderkam)
*/
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
-describe("to-dom-coords", function() {
+import Proxy from './Proxy';
+import CanvasAssertions from './CanvasAssertions';
+import {assertDeepCloseTo} from './custom_asserts';
-var origFunc = Dygraph.getContext;
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
- Dygraph.getContext = function(canvas) {
- return new Proxy(origFunc(canvas));
- }
-});
+describe("to-dom-coords", function() {
-afterEach(function() {
- Dygraph.getContext = origFunc;
-});
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
// Checks that toDomCoords and toDataCoords are inverses of one another.
var checkForInverses = function(g) {
*
* @author gmadrid@gmail.com (George Madrid)
*/
+
+import Dygraph from '../../src/dygraph';
+import {Granularity, getDateAxis} from '../../src/dygraph-tickers';
+import * as utils from '../../src/dygraph-utils';
+import DEFAULT_ATTRS from '../../src/dygraph-default-attrs';
+
describe("two-digit-years", function() {
it('testTwoDigitYears', function() {
start.setFullYear(9);
end.setFullYear(11);
- var ticks = Dygraph.getDateAxis(start, end, Dygraph.QUARTERLY, function(x) {
- return Dygraph.DEFAULT_ATTRS.axes['x'][x];
+ var ticks = getDateAxis(start, end, Granularity.QUARTERLY, function(x) {
+ return DEFAULT_ATTRS.axes['x'][x];
});
// This breaks in Firefox & Safari:
* @fileoverview Tests for the updateOptions function.
* @author antrob@google.com (Anthony Robledo)
*/
+
+import Dygraph from '../../src/dygraph';
+
describe("update-options", function() {
+
+cleanupAfterEach();
var opts = {
width: 480,
"2011-04-04,9,5\n" +
"2011-05-05,8,3\n";
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div><div id='labels'></div>";
-});
-
-afterEach(function() {
-});
-
/*
* Tweaks the dygraph so it sets g._testDrawCalled to true when internal method
* drawGraph_ is called. Call unWrapDrawGraph when done with this.
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
-describe("update-while-panning", function() {
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import DygraphOps from './DygraphOps';
-afterEach(function() {
-});
+describe("update-while-panning", function() {
+
+cleanupAfterEach();
// This tests the following sequence:
// 1. Begin dragging a chart (x-panning)
* @author danvdk@gmail.com (Dan Vanderkam)
*/
+import * as utils from '../../src/dygraph-utils';
+
describe("utils-tests", function() {
it('testUpdate', function() {
assert.deepEqual({x: 1, y: 2}, a['c']);
assert.deepEqual({f: 10, g: 20}, a['d']);
- Dygraph.update(a, { c: { x: 2 } });
+ utils.update(a, { c: { x: 2 } });
assert.deepEqual({x: 2}, a['c']);
- Dygraph.update(a, { d: null });
+ utils.update(a, { d: null });
assert.equal(null, a['d']);
- Dygraph.update(a, { a: 10, b: [1, 2] });
+ utils.update(a, { a: 10, b: [1, 2] });
assert.equal(10, a['a']);
assert.deepEqual([1, 2], a['b']);
assert.deepEqual({x: 2}, a['c']);
assert.deepEqual({x: 1, y: 2}, a['c']);
assert.deepEqual({f: 10, g: 20}, a['d']);
- Dygraph.updateDeep(a, { c: { x: 2 } });
+ utils.updateDeep(a, { c: { x: 2 } });
assert.deepEqual({x: 2, y: 2}, a['c']);
- Dygraph.updateDeep(a, { d: null });
+ utils.updateDeep(a, { d: null });
assert.equal(null, a['d']);
- Dygraph.updateDeep(a, { a: 10, b: [1, 2] });
+ utils.updateDeep(a, { a: 10, b: [1, 2] });
assert.equal(10, a['a']);
assert.deepEqual([1, 2], a['b']);
assert.deepEqual({x: 2, y: 2}, a['c']);
};
var b = {};
- Dygraph.updateDeep(b, a);
+ utils.updateDeep(b, a);
b.a = 2;
assert.equal(1, a.a);
it('testIterator_nopredicate', function() {
var array = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
- var iter = Dygraph.createIterator(array, 1, 4);
+ var iter = utils.createIterator(array, 1, 4);
assert.isTrue(iter.hasNext);
assert.equal('b', iter.peek);
assert.equal('b', iter.next());
it('testIterator_predicate', function() {
var array = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
- var iter = Dygraph.createIterator(array, 1, 4,
+ var iter = utils.createIterator(array, 1, 4,
function(array, idx) { return array[idx] !== 'd' });
assert.isTrue(iter.hasNext);
assert.equal('b', iter.peek);
it('testIterator_empty', function() {
var array = [];
- var iter = Dygraph.createIterator([], 0, 0);
+ var iter = utils.createIterator([], 0, 0);
assert.isFalse(iter.hasNext);
});
it('testIterator_outOfRange', function() {
var array = ['a', 'b', 'c'];
- var iter = Dygraph.createIterator(array, 1, 4,
+ var iter = utils.createIterator(array, 1, 4,
function(array, idx) { return array[idx] !== 'd' });
assert.isTrue(iter.hasNext);
assert.equal('b', iter.peek);
// with invalid boundaries.
it('testIterator_whole_array', function() {
var array = ['a', 'b', 'c'];
- var iter = Dygraph.createIterator(array, 0, array.length,
+ var iter = utils.createIterator(array, 0, array.length,
function(array, idx) {
if (idx < 0 || idx >= array.length) {
throw "err";
it('testIterator_no_args', function() {
var array = ['a', 'b', 'c'];
- var iter = Dygraph.createIterator(array);
+ var iter = utils.createIterator(array);
assert.isTrue(iter.hasNext);
assert.equal('a', iter.next());
assert.isTrue(iter.hasNext);
});
it('testToRGB', function() {
- assert.deepEqual({r: 255, g: 200, b: 150}, Dygraph.toRGB_('rgb(255,200,150)'));
- assert.deepEqual({r: 255, g: 200, b: 150}, Dygraph.toRGB_('#FFC896'));
- assert.deepEqual({r: 255, g: 0, b: 0}, Dygraph.toRGB_('red'));
+ assert.deepEqual({r: 255, g: 200, b: 150}, utils.toRGB_('rgb(255,200,150)'));
+ assert.deepEqual({r: 255, g: 200, b: 150}, utils.toRGB_('#FFC896'));
+ assert.deepEqual({r: 255, g: 0, b: 0}, utils.toRGB_('red'));
assert.deepEqual({r: 255, g: 200, b: 150, a: 0.6},
- Dygraph.toRGB_('rgba(255, 200, 150, 0.6)'));
+ utils.toRGB_('rgba(255, 200, 150, 0.6)'));
});
it('testIsPixelChangingOptionList', function() {
- var isPx = Dygraph.isPixelChangingOptionList;
+ var isPx = utils.isPixelChangingOptionList;
assert.isTrue(isPx([], { axes: { y: { digitsAfterDecimal: 3 }}}));
assert.isFalse(isPx([], { axes: { y: { axisLineColor: 'blue' }}}));
});
* @author sergeyslepian@gmail.com
*/
-describe("visibility", function() {
+import Dygraph from '../../src/dygraph';
+import Util from './Util';
-beforeEach(function() {
- document.body.innerHTML = "<div id='graph'></div>";
-});
+describe("visibility", function() {
-afterEach(function() {
-});
+cleanupAfterEach();
/**
* Does a bunch of the shared busywork of setting up a graph and changing its visibility.
{
"name": "dygraphs",
- "main": "dygraph-combined.js",
+ "main": "dist/dygraph.js",
"ignore": [
"Makefile",
"NOTES",
"auto_tests",
- "closure-todo.txt",
"common",
- "compile-with-closure.sh",
"data.js",
"docs",
"experimental",
"release.sh",
"releases.json",
"screenshot.png",
+ "scripts",
"test.sh",
"tests",
"thumbnail.png"
}
}
- Dygraph.addEvent(document, "keydown", this.keyDownListener_);
+ document.addEventListener("keydown", this.keyDownListener_);
this.reposition();
window.addEventListener('resize', this.reposition, false);
document.documentElement.addEventListener('onscroll', this.reposition);
}
TextArea.prototype.hide = function() {
- Dygraph.removeEvent(document, "keypress", this.keyDownListener_);
+ document.removeEventListener('keypress', this.keyDownListener_);
this.keyDownListener_ = null;
this.elem.style.display = "none";
this.background.style.display = "none";
+++ /dev/null
-/**
- * @license
- * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-// A dygraph "auto-loader".
-
-// Check where this script was sourced from. If it was sourced from
-// '../dygraph-dev.js', then we should source all the other scripts with the
-// same relative path ('../dygraph.js', '../dygraph-canvas.js', ...)
-(function() {
- var src=document.getElementsByTagName('script');
- var script = src[src.length-1].getAttribute("src");
-
- // This list needs to be kept in sync w/ the one in generate-combined.sh
- // and the one in jsTestDriver.conf.
- var source_files = [
- "src/polyfills/console.js",
- "src/polyfills/dashed-canvas.js",
- "src/dygraph-options.js",
- "src/dygraph-layout.js",
- "src/dygraph-canvas.js",
- "src/dygraph.js",
- "src/dygraph-utils.js",
- "src/dygraph-gviz.js",
- "src/dygraph-interaction-model.js",
- "src/dygraph-tickers.js",
- "src/dygraph-plugin-base.js",
- "src/plugins/annotations.js",
- "src/plugins/axes.js",
- "src/plugins/chart-labels.js",
- "src/plugins/grid.js",
- "src/plugins/legend.js",
- "src/plugins/range-selector.js",
- "src/dygraph-plugin-install.js",
- "src/dygraph-options-reference.js", // Shouldn't be included in generate-combined.sh
- "src/datahandler/datahandler.js",
- "src/datahandler/default.js",
- "src/datahandler/default-fractions.js",
- "src/datahandler/bars.js",
- "src/datahandler/bars-error.js",
- "src/datahandler/bars-custom.js",
- "src/datahandler/bars-fractions.js"
- ];
-
- for (var i = 0; i < source_files.length; i++) {
- document.write('<script type="text/javascript" src="' + script.replace('dygraph-dev.js', source_files[i]) + '"></script>\n');
- }
-})();
+++ /dev/null
-@import url("palette.css");
-@import url("tooltip.css");
-@import url("../../common/textarea.css");
-
-#selector {
- width: 150px;
- margin-left: auto;
- margin-right: auto;
-}
-
-#toggleInstructions {
- color: #0000DD;
-}
-
-#toggleInstructions:hover {
- color: #0000FF;
- text-decoration: underline;
-}
+++ /dev/null
-<!DOCTYPE html>
-<html>
- <head>
- <title>Palette Demo</title>
- <script type="text/javascript" src="jquery-1.8.3.min.js"></script>
- <script type="text/javascript" src="../../dygraph-dev.js"></script>
- <script type="text/javascript" src="options.js"></script>
- <script type="text/javascript" src="../../common/textarea.js"></script>
- <script type="text/javascript" src="tooltip.js"></script>
- <script type="text/javascript" src="palette.js"></script>
- <script type="text/javascript" src="multi-palette.js"></script>
- <script type="text/javascript" src="samples.js"></script>
- <script type="text/javascript" src="index.js"></script>
- <link rel="stylesheet" type="text/css" href="index.css" />
- </head>
- <body>
- <h2>Palette</h2>
- <div style="font-size:smaller;"><p>To configure this chart, tweak the values on the right.
- Enter applies changes, and the filter bar on the top reduces selections</p></div>
- <table>
- <tr>
- <td valign="top">
- <div id="selector">
- <select></select>
- </div>
- <div id="graph"></div>
- <div id="status" style="width:200px; font-size:0.8em; padding-top:5px;"></div>
- <div class="instructions">
- <a id="toggleInstructions">instructions</a>
- <div id="instructions" style="display: none">
- <h3>Learn By Doing</h3>
- <ol>
- <li>In the filter box, type <code>point</code>.</li>
- <li>Click the <em>drawPoints</em> toggle button until <code>true</code> appears</li>
- <li>You will see dots on the graph where points exist.</li>
- <li>In the <em>pointSize</em> text box, enter <code>5</code></li>
- <li>Press <code>enter</code> or click <em>Refresh</em>. The dots
- just got larger.</li>
- <li>Type <code>callback</code> in the filter box.</li>
- <li>Instead of a text box, you will see buttons that can be used
- to define callbacks. Click the button for <em>clickCallback</em>.</li>
- <li>You will see that the prototype function body is
- <code>function(e, x, points){ }</code>. Paste in this
- replacement function:<p/>
- <code>function(e, x){<br/> var elem =
- document.getElementById("messages");<br/> elem.innerHTML =
- elem.innerHTML + x + "<br>";<br/>}</code></li>
- <li>Click the <em>OK</em> button. The <em>clickCallback</em>
- button now says <code>defined</code> instead of <code>not defined</code>.</li>
- <li>Click anywhere on the graph. The x-value will appear on the
- page.</li>
- <li>If you click directly on a point, then an alert box will
- indicate that you've clicked on a point. That's because the
- <em>pointClickCallback</em> was defined already.</li>
- <li><b>Have fun and send feedback!</b></li>
- </ol>
- <h3>tips</h3>
- The palette on the right contains (most) Dygraphs options. Here's
- how they work:
- <ul>
- <li>The selection box on top can be used to choose your own data source.</li>
- <li>Use the filter box to constrain your selection. For instance,
- typing <code>draw</code> will show all options with that phrase in
- its name.</li>
- <li>Each field has specific types. The types are not documented,
- but if you hover over an entry (or click on it) it will give you a
- hint.</li>
- <li>Enter a new value for the option, and hit the
- <code>enter</code> key, or the <em>Refresh</em> button.</li>
- <li>Some types require special consideration:
- <li>integers, floats, strings and booleans can be entered
- as-is.</li>
- <li>arrays of elements can be comma-separated <em>except string
- arrays, which are (at the moment) semicolon-separated (anyone
- interested in making a good string array parser, take a shot.</em></li>
- <li>Callbacks are defined in a (crappy tiny) dialog box. If the
- function isn't defined, then a prototype of the function will be
- presented to the user.</li>
- </li>
- </ul>
-
- Then in the filter text box, type "point". Set drawPoints: true and
- pointSize: 5.
- You get the idea.
- </div>
- </div>
- </td>
- <td valign="top"><div id="optionsPalette"></div></td>
- </tr>
- </table>
- </body>
- <script type="text/javascript">
- Index.start();
- $(function() {
- $("#toggleInstructions").click(function() {
- $("#instructions").toggle(500);
- });
- });
- </script>
-</html>
+++ /dev/null
-// Copyright (c) 2012 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/**
- * @fileoverview Javascript to run index.html.
- *
- * @author konigsberg@google.com (Robert Konigsberg)
- */
-
-"use strict";
-
-var Index = {};
-
-Index.splitVariables = function() { // http://www.idealog.us/2006/06/javascript_to_p.html
- var query = window.location.search.substring(1);
- var args = {};
- var vars = query.split("&");
- for (var i = 0; i < vars.length; i++) {
- if (vars[i].length > 0) {
- var pair = vars[i].split("=");
- args[pair[0]] = pair[1];
- }
- }
- return args;
-}
-
-/**
- * Draw the graph.
- * @param {Object} element the display element
- * @param {Object} data the data to be shown
- * @param {Object} options the options hash.
- */
-Index.draw = function(element, data, options) {
- element.innerHTML = "";
- element.removeAttribute("style");
-
- // Replace the drawCallback function with one that also lets us track
- // all labels (for the palette.)
- // If the drawCallback option is not specified, use a null function.
- var originalDraw = options["drawCallback"] || function() {};
- options.drawCallback = function(g, isInitial) {
- Index.palette.setSeries(g.getLabels());
- // Call the original function, too.
- originalDraw(g, isInitial);
- };
-
- var g = new Dygraph(
- element,
- data,
- options
- );
-
- // These don't work yet.
- g.updateOptions({
- labelsDiv: 'status',
- });
-}
-
-Index.addMessage = function(text) {
- var messages = document.getElementById("messages");
- messages.textContent = messages.textContent + text + "\n";
-}
-
-/**
- * Start up the palette system.
- */
-Index.start = function() {
- var variables = Index.splitVariables();
- var sampleName = variables["sample"] || "interestingShapes";
- var sampleIndex = Samples.indexOf(sampleName);
- var sample = Samples.data[sampleIndex];
- var data = sample.data;
- var redraw = function() {
- Index.draw(document.getElementById("graph"), data, Index.palette.read());
- }
-
- // Selector is the drop-down for selecting a set of data.
-
- // Popupate the selector with the set of data samples
- var selector = document.getElementById("selector").getElementsByTagName("select")[0];
- for (var idx in Samples.data) {
- var entry = Samples.data[idx];
- var option = document.createElement("option");
- option.value = entry.id;
- option.textContent = entry.title;
- selector.appendChild(option);
- }
- selector.onchange = function() {
- var id = selector.options[selector.selectedIndex].value;
- var url = document.URL;
- var qmIndex = url.indexOf("?");
- if (qmIndex >= 0) {
- url = url.substring(0, qmIndex);
- }
- url = url + "?sample=" + id;
- for (var idx in variables) {
- if (idx != "sample") {
- url = url + "&" + idx + "=" + variables[idx];
- }
- }
- window.location = url;
- }
- selector.selectedIndex = sampleIndex;
-
- // Palette contains the widget that builds options.
- Index.palette = new MultiPalette();
- Index.palette.create(document.getElementById("optionsPalette"));
- Index.palette.write(sample.options);
- Index.palette.onchange = redraw;
- Index.palette.filterBar.focus();
-
- redraw();
-
- // Find all new options which we don't implement here in the palette.
- for (var opt in Dygraph.OPTIONS_REFERENCE) {
- if (!(opt in opts)) {
- var entry = Dygraph.OPTIONS_REFERENCE[opt];
- console.warn("missing option: " + opt + " of type " + entry.type);
- }
- }
-}
+++ /dev/null
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */\r
-(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a=nt.compile=function(e,t){var n,r=[],i=[],s=A[d][e+" "];if(!s){t||(t=ut(e)),n=t.length;while(n--)s=ht(t[n]),s[d]?r.push(s):i.push(s);s=A(e,pt(i,r))}return s},g.querySelectorAll&&function(){var e,t=vt,n=/'|\\/g,r=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,i=[":focus"],s=[":active"],u=y.matchesSelector||y.mozMatchesSelector||y.webkitMatchesSelector||y.oMatchesSelector||y.msMatchesSelector;K(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="<p test=''></p>",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="<input type='hidden'/>",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t<n;t++)if(v.contains(u[t],this))return!0});o=this.pushStack("","find",e);for(t=0,n=this.length;t<n;t++){r=o.length,v.find(e,this[t],o);if(t>0)for(i=r;i<o.length;i++)for(s=0;s<r;s++)if(o[s]===o[i]){o.splice(i--,1);break}}return o},has:function(e){var t,n=v(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(v.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1),"not",e)},filter:function(e){return this.pushStack(ft(this,e,!0),"filter",e)},is:function(e){return!!e&&(typeof e=="string"?st.test(e)?v(e,this.context).index(this[0])>=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r<i;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&n.nodeType!==11){if(o?o.index(n)>-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/<tbody/i,gt=/<|&#?\w+;/,yt=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,wt=new RegExp("<(?:"+ct+")[\\s/>]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,Nt={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X<div>","</div>"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1></$2>");try{for(;r<i;r++)n=this[r]||{},n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),n.innerHTML=e);n=0}catch(s){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){return ut(this[0])?this.length?this.pushStack(v(v.isFunction(e)?e():e),"replaceWith",e):this:v.isFunction(e)?this.each(function(t){var n=v(this),r=n.html();n.replaceWith(e.call(this,t,r))}):(typeof e!="string"&&(e=v(e).detach()),this.each(function(){var t=this.nextSibling,n=this.parentNode;v(this).remove(),t?v(t).before(e):v(n).append(e)}))},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=[].concat.apply([],e);var i,s,o,u,a=0,f=e[0],l=[],c=this.length;if(!v.support.checkClone&&c>1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a<c;a++)r.call(n&&v.nodeName(this[a],"table")?Lt(this[a],"tbody"):this[a],a===u?o:v.clone(o,!0,!0))}o=s=null,l.length&&v.each(l,function(e,t){t.src?v.ajax?v.ajax({url:t.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):v.error("no ajax"):v.globalEval((t.text||t.textContent||t.innerHTML||"").replace(Tt,"")),t.parentNode&&t.parentNode.removeChild(t)})}return this}}),v.buildFragment=function(e,n,r){var s,o,u,a=e[0];return n=n||i,n=!n.nodeType&&n[0]||n,n=n.ownerDocument||n,e.length===1&&typeof a=="string"&&a.length<512&&n===i&&a.charAt(0)==="<"&&!bt.test(a)&&(v.support.checkClone||!St.test(a))&&(v.support.html5Clone||!wt.test(a))&&(o=!0,s=v.fragments[a],u=s!==t),s||(s=n.createDocumentFragment(),v.clean(e,n,s,r),o&&(v.fragments[a]=u&&s)),{fragment:s,cacheable:o}},v.fragments={},v.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){v.fn[e]=function(n){var r,i=0,s=[],o=v(n),u=o.length,a=this.length===1&&this[0].parentNode;if((a==null||a&&a.nodeType===11&&a.childNodes.length===1)&&u===1)return o[t](this[0]),this;for(;i<u;i++)r=(i>0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1></$2>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]==="<table>"&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("<div>").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r<i;r++)n=e[r],Vn[n]=Vn[n]||[],Vn[n].unshift(t)},prefilter:function(e,t){t?Xn.unshift(e):Xn.push(e)}}),v.Tween=Yn,Yn.prototype={constructor:Yn,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(v.cssNumber[n]?"":"px")},cur:function(){var e=Yn.propHooks[this.prop];return e&&e.get?e.get(this):Yn.propHooks._default.get(this)},run:function(e){var t,n=Yn.propHooks[this.prop];return this.options.duration?this.pos=t=v.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yn.propHooks._default.set(this),this}},Yn.prototype.init.prototype=Yn.prototype,Yn.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=v.css(e.elem,e.prop,!1,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){v.fx.step[e.prop]?v.fx.step[e.prop](e):e.elem.style&&(e.elem.style[v.cssProps[e.prop]]!=null||v.cssHooks[e.prop])?v.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yn.propHooks.scrollTop=Yn.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},v.each(["toggle","show","hide"],function(e,t){var n=v.fn[t];v.fn[t]=function(r,i,s){return r==null||typeof r=="boolean"||!e&&v.isFunction(r)&&v.isFunction(i)?n.apply(this,arguments):this.animate(Zn(t,!0),r,i,s)}}),v.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Gt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=v.isEmptyObject(e),s=v.speed(t,n,r),o=function(){var t=Kn(this,v.extend({},e),s);i&&t.stop(!0)};return i||s.queue===!1?this.each(o):this.queue(s.queue,o)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return typeof e!="string"&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=e!=null&&e+"queueHooks",s=v.timers,o=v._data(this);if(n)o[n]&&o[n].stop&&i(o[n]);else for(n in o)o[n]&&o[n].stop&&Wn.test(n)&&i(o[n]);for(n=s.length;n--;)s[n].elem===this&&(e==null||s[n].queue===e)&&(s[n].anim.stop(r),t=!1,s.splice(n,1));(t||!r)&&v.dequeue(this,e)})}}),v.each({slideDown:Zn("show"),slideUp:Zn("hide"),slideToggle:Zn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){v.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),v.speed=function(e,t,n){var r=e&&typeof e=="object"?v.extend({},e):{complete:n||!n&&t||v.isFunction(e)&&e,duration:e,easing:n&&t||t&&!v.isFunction(t)&&t};r.duration=v.fx.off?0:typeof r.duration=="number"?r.duration:r.duration in v.fx.speeds?v.fx.speeds[r.duration]:v.fx.speeds._default;if(r.queue==null||r.queue===!0)r.queue="fx";return r.old=r.complete,r.complete=function(){v.isFunction(r.old)&&r.old.call(this),r.queue&&v.dequeue(this,r.queue)},r},v.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},v.timers=[],v.fx=Yn.prototype.init,v.fx.tick=function(){var e,n=v.timers,r=0;qn=v.now();for(;r<n.length;r++)e=n[r],!e()&&n[r]===e&&n.splice(r--,1);n.length||v.fx.stop(),qn=t},v.fx.timer=function(e){e()&&v.timers.push(e)&&!Rn&&(Rn=setInterval(v.fx.tick,v.fx.interval))},v.fx.interval=13,v.fx.stop=function(){clearInterval(Rn),Rn=null},v.fx.speeds={slow:600,fast:200,_default:400},v.fx.step={},v.expr&&v.expr.filters&&(v.expr.filters.animated=function(e){return v.grep(v.timers,function(t){return e===t.elem}).length});var er=/^(?:body|html)$/i;v.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){v.offset.setOffset(this,e,t)});var n,r,i,s,o,u,a,f={top:0,left:0},l=this[0],c=l&&l.ownerDocument;if(!c)return;return(r=c.body)===l?v.offset.bodyOffset(l):(n=c.documentElement,v.contains(n,l)?(typeof l.getBoundingClientRect!="undefined"&&(f=l.getBoundingClientRect()),i=tr(c),s=n.clientTop||r.clientTop||0,o=n.clientLeft||r.clientLeft||0,u=i.pageYOffset||n.scrollTop,a=i.pageXOffset||n.scrollLeft,{top:f.top+u-s,left:f.left+a-o}):f)},v.offset={bodyOffset:function(e){var t=e.offsetTop,n=e.offsetLeft;return v.support.doesNotIncludeMarginInBodyOffset&&(t+=parseFloat(v.css(e,"marginTop"))||0,n+=parseFloat(v.css(e,"marginLeft"))||0),{top:t,left:n}},setOffset:function(e,t,n){var r=v.css(e,"position");r==="static"&&(e.style.position="relative");var i=v(e),s=i.offset(),o=v.css(e,"top"),u=v.css(e,"left"),a=(r==="absolute"||r==="fixed")&&v.inArray("auto",[o,u])>-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
\ No newline at end of file
+++ /dev/null
-// Copyright (c) 2011 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/**
- * @fileoverview Multiple Dygraphs palettes, grouped by global, series, etc..
- *
- * @author konigsberg@google.com (Robert Konigsberg)
- */
-
-function MultiPalette() {
- this.palettes = {};
- this.root = null;
- this.filterBar = null;
- // This is meant to be overridden by a palette host.
- this.activePalette = null;
- this.onchange = function() {};
-}
-
-MultiPalette.optionSetValues = {
- "global": "global",
- "x": "x axis",
- "y": "y axis",
- "y2": "y2 axis",
-};
-
-MultiPalette.prototype.create = function(parentElement) {
- var self = this;
-
- this.root = $("<div>").addClass("palette").appendTo(parentElement);
- var header = $("<div>").addClass("header").appendTo(this.root);
- // Selector for series and axes.
- var selectorRow = $("<div>").appendTo(header);
- this.optionSelector = $("<select>")
- .change(function(x) {
- self.activate(self.optionSelector.val());
- });
-
- selectorRow
- .append($("<span>").text("Option Set:"))
- .append(this.optionSelector)
- .append($("<span>")
- .append($("<a>")
- .addClass("link")
- .text("to hash")
- .css("float", "right")
- .css("padding-right", "8px")
- .click(function() { self.showHash(); })));
-
- var filter = function() {
- $.each(self.palettes, function(key, value) {
- value.filter(self.filterBar.val());
- });
- }
-
- this.filterBar = $("<input>", { type : "search" })
- .keyup(filter)
- .click(filter);
-
- header.append($("<div>")
- .append($("<span>").text("Filter:"))
- .append($("<span>").append(this.filterBar))
- .append($("<span>")
- .append($("<a>")
- .addClass("link")
- .text("Redraw")
- .css("float", "right")
- .css("padding-right", "8px")
- .click(function() { self.onchange(); }))));
-
- $.each(MultiPalette.optionSetValues, function(key, value) {
- self.createPalette_(key, key, value);
- });
-
- this.activate("global");
-}
-
-MultiPalette.prototype.createPalette_ = function(key, scope, value) {
- this.optionSelector
- .append($("<option></option>")
- .attr("value", key)
- .text(value));
- var palette = new Palette(scope);
- palette.create(this.root);
- palette.root.hide();
- var self = this;
- palette.onchange = function() {
- self.onchange();
- };
- this.palettes[key] = palette;
-}
-
-MultiPalette.prototype.setSeries = function(labels) {
- for (var idx = 1; idx < labels.length; idx++) {
- this.conditionallyAddSingleSeries_(labels[idx]);
- }
-}
-
-MultiPalette.prototype.conditionallyAddSingleSeries_ = function(series) {
- var key = "series:" + series;
- if (!this.palettes.hasOwnProperty(key)) {
- this.createPalette_(key, "series", series + " (series)");
- }
-}
-
-MultiPalette.prototype.activate = function(key) {
- if (this.activePalette) {
- this.activePalette.root.hide();
- }
- this.activePalette = this.palettes[key];
- this.activePalette.root.show();
-}
-
-MultiPalette.prototype.showHash = function() {
- var hash = this.read();
- var textarea = new TextArea();
-
- var hashToString = function(hash) {
- /*
- * JSON.stringify isn't built to be nice to functions. The following fixes
- * this.
- *
- * First, val.toString only does part of the work, turning it into
- * "function () {\n alert(\"p-click!\");\n}",
- *
- * {start,end}Marker make the surrounding quotes easy to find, and then
- * remove them. It also converts the instances of \n and \" so the
- * result looks like:
- * function () {
- * alert("p-click!");
- * }",
- */
- var startMarker = "<~%!<";
- var endMarker = ">!%~>";
- var replacer = function(key, val) {
- if (typeof val === 'function') {
- return startMarker + val.toString() + endMarker;
- }
- return val;
- }
- var text = JSON.stringify(hash, replacer, 2);
- while(true) {
- var start = text.indexOf(startMarker);
- var end = text.indexOf(endMarker);
- if (start == -1) {
- break;
- }
- var substring = text.substring(start + startMarker.length, end);
- while(substring.indexOf("\\n") >= 0) {
- substring = substring.replace("\\n", "\n");
- }
- while(substring.indexOf("\\\"") >= 0) {
- substring = substring.replace("\\\"", "\"");
- }
- text = text.substring(0, start - 1)
- + substring
- + text.substring(end + endMarker.length + 1);
- }
- return text;
- }
-
- var text = hashToString(hash);
- var self = this;
- textarea.show("options", text);
- textarea.okCallback = function(value) {
- if (value != text) {
- var newHash;
- eval("newHash = " + value + ";");
- self.write(newHash);
- self.onchange();
- }
- };
-}
-
-/**
- * Read from palette
- */
-MultiPalette.prototype.read = function() {
- var results = this.palettes.global.read();
- results.axes = {};
- results.series = {};
- var clearIfEmpty = function(hash, key) {
- var val = hash[key];
- if ($.isEmptyObject(val)) {
- delete hash[key];
- }
- }
- var clearEmptyChildren = function(hash) {
- for (var key in hash) {
- if (hash.hasOwnProperty(key)) {
- clearIfEmpty(hash, key);
- }
- }
- }
-
- results.axes.x = this.palettes.x.read();
- results.axes.y = this.palettes.y.read();
- results.axes.y2 = this.palettes.y2.read();
-
- clearEmptyChildren(results.axes);
- clearIfEmpty(results, "axes");
-
- for (var key in this.palettes) {
- if (key.indexOf("series:") == 0) {
- var series = key.substring("series:".length);
- results.series[series] = this.palettes[key].read();
- }
- }
-
- clearEmptyChildren(results.series);
- clearIfEmpty(results, "series");
-
- return results;
-}
-
-/**
- * Write to palette from hash.
- */
-MultiPalette.prototype.write = function(hash) {
- this.palettes.global.write(hash);
- if (hash.hasOwnProperty("axes")) {
- var axes = hash.axes;
- this.palettes.x.write(axes["x"]);
- this.palettes.y.write(axes["y"]);
- this.palettes.y2.write(axes["y2"]);
- }
-
- if (hash.hasOwnProperty("series")) {
- for (var key in hash.series) {
- if (hash.series.hasOwnProperty(key)) {
- this.conditionallyAddSingleSeries_(key);
- this.palettes["series:" + key].write(hash.series[key]);
- }
- }
- }
-}
+++ /dev/null
-// Copyright (c) 2011 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/**
- * @fileoverview List of options and their types, used for the palette.
- *
- * @author konigsberg@google.com (Robert Konigsberg)
- */
-
-"use strict";
-
-/**
- * Options availabile to the palette.
- *
- * Each entry is the name of the option, followed by:
- * type: describes the type of option, which can be:
- * boolean|string|float|int|array<boolean>|array<int>|array<float>|array<Date>
- * or function(parameter list)
- * scope: if empty, then available in global scope only. Otherwise,
- * it's an array with possible values global|series|x|y|y2|highlight.
- */
-var opts = {
- // These two exist, but are not used by the palette at all.
- series : { type : null, scope : [] },
- axes : { type : null, scope : [] },
-
- animatedZooms : {
- type : "boolean"
- },
- annotationClickHandler : {
- type : "function(annotation, point, dygraph, event)"
- },
- annotationDblClickHandler : {
- type : "function(annotation, point, dygraph, event)"
- },
- annotationMouseOutHandler : {
- type : "function(annotation, point, dygraph, event)"
- },
- annotationMouseOverHandler : {
- type : "function(annotation, point, dygraph, event)"
- },
- avoidMinZero : {
- type : "boolean"
- },
- axis : {
- type : "string",
- scope : [ "series" ]
- },
- axisLabelColor : {
- type : "string",
- scope : [ "global", "x", "y", "y2" ]
- },
- axisLabelFontSize : {
- type : "int",
- scope : [ "global", "x", "y", "y2" ]
- },
- axisLabelFormatter : {
- type : "function(numberOrDate, granularity, opts, dygraph)",
- scope : [ "x", "y", "y2" ]
- },
- axisLabelWidth : {
- type : "int",
- // scope : [ "global", "x", "y", "y2" ]
- },
- axisLineColor : {
- type : "string",
- scope : [ "global", "x", "y", "y2" ]
- },
- axisLineWidth : {
- type : "int",
- scope : [ "global", "x", "y", "y2" ]
- },
- axisTickSize : {
- type : "int",
- // scope : [ "global", "x", "y", "y2" ]
- },
- clickCallback : {
- type : "function(e, x, points)"
- },
- colorSaturation : {
- type : "float"
- },
- colors : {
- type : "array<string>"
- },
- colorValue : {
- type : "float"
- },
- connectSeparatedPoints : {
- type : "boolean"
- },
- customBars : {
- type : "boolean"
- },
- dateWindow : {
- type : "array<Date>"
- },
- delimiter : {
- type : "string"
- },
- digitsAfterDecimal : {
- type : "int"
- },
- displayAnnotations : {
- type : "boolean"
- },
- drawAxesAtZero : {
- type : "boolean"
- },
- drawCallback : {
- type : "function(dygraph, is_initial)"
- },
- drawGapEdgePoints : {
- type : "boolean"
- },
- drawHighlightPointCallback : {
- type : "function(g, seriesName, canvasContext, cx, cy, color, pointSize)",
- scope : [ "global", "series", "y", "y2" ]
- },
- drawPoints : {
- type : "boolean",
- scope : [ "global", "series", "y", "y2" ]
- },
- drawPointCallback : {
- type : "function(g, seriesName, canvasContext, cx, cy, color, pointSize)",
- scope : [ "global", "series", "y", "y2" ]
- },
- drawXAxis : {
- type : "boolean"
- },
- drawXGrid : {
- type : "boolean"
- },
- drawYAxis : {
- type : "boolean"
- },
- drawYGrid : {
- type : "boolean"
- },
- errorBars : {
- type : "boolean"
- },
- fillAlpha : {
- type : "float"
- },
- fillGraph : {
- type : "boolean"
- },
- fractions : {
- type : "boolean"
- },
- gridLineColor : {
- type : "string"
- },
- gridLineWidth : {
- type : "int"
- },
- height : {
- type : "int"
- },
- hideOverlayOnMouseOut : {
- type : "boolean"
- },
- highlightCallback : {
- type : "function(event, x, points,row)"
- },
- highlightCircleSize : {
- type : "int",
- scope : [ "global", "series", "y", "y2" ]
- },
- includeZero : {
- type : "boolean"
- },
- isZoomedIgnoreProgrammaticZoom : {
- type : "boolean"
- },
- labelsDivWidth : {
- type : "integer"
- },
- labels : {
- type : "array<string>"
- },
- labelsKMB : {
- type : "boolean"
- },
- labelsKMG2 : {
- type : "boolean"
- },
- labelsSeparateLines : {
- type : "boolean"
- },
- labelsShowZeroValues : {
- type : "boolean"
- },
- legend : {
- type : "string"
- },
- logscale : {
- type : "boolean"
- },
- maxNumberWidth : {
- type : "int"
- },
- panEdgeFraction : {
- type : "float"
- },
- pixelsPerLabel : {
- type : "int"
- },
- pixelsPerXLabel : {
- type : "int"
- },
- pixelsPerYLabel : {
- type : "int"
- },
- pointClickCallback : {
- type : "function(e, point)"
- },
- pointSize : {
- type : "integer",
- scope : [ "global", "series", "y", "y2" ]
- },
- rangeSelectorHeight : {
- type : "int"
- },
- rangeSelectorPlotFillColor : {
- type : "int"
- },
- rangeSelectorPlotStrokeColor : {
- type : "int"
- },
- rightGap : {
- type : "boolean"
- },
- rollPeriod : {
- type : "int"
- },
- showLabelsOnHighlight : {
- type : "boolean"
- },
- showRangeSelector : {
- type : "boolean"
- },
- showRoller : {
- type : "boolean"
- },
- sigFigs : {
- type : "int"
- },
- sigma : {
- type : "float"
- },
- stackedGraph : {
- type : "boolean"
- },
- stepPlot : {
- type : "boolean"
- },
- strokeBorderColor : {
- type : "string",
- scope : [ "global", "series", "y", "y2" ]
- },
- strokeBorderWidth : {
- type : "float",
- scope : [ "global", "series", "y", "y2" ]
- },
- strokePattern : {
- type : "array<int>",
- scope : [ "global", "series", "y", "y2" ]
- },
- strokeWidth : {
- type : "float",
- scope : [ "global", "series", "y", "y2" ]
- },
- timingName : {
- type : "string"
- },
- title : {
- type : "string"
- },
- titleHeight : {
- type : "integer"
- },
- underlayCallback : {
- type : "function(canvas, area, dygraph)"
- },
- unhighlightCallback : {
- type : "function(event)"
- },
- valueRange : {
- type : "array<float>"
- },
- visibility : {
- type : "array<boolean>"
- },
- width : {
- type : "int"
- },
- wilsonInterval : {
- type : "boolean"
- },
- xAxisHeight : {
- type : "int"
- },
- xAxisLabelWidth : {
- type : "int"
- },
- xLabelHeight : {
- type : "int"
- },
- xlabel : {
- type : "string"
- },
- xValueParser : {
- type : "function(str)"
- },
- yAxisLabelWidth : {
- type : "int"
- },
- yLabelWidth : {
- type : "int"
- },
- ylabel : {
- type : "string"
- },
- zoomCallback : {
- type : "function(minDate, maxDate, yRanges)"
- }
-};
-
+++ /dev/null
-.palette {
- border-style: solid;
- border-width: 1px;
- border-color: #bbbbbb;
- font-size: smaller;
- font-family: Arial, Verdana, sans-serif;
- width: 300px;
- padding:2px;
- color: #333333;
-}
-
-.palette .header {
- background-color: #b0c0e0;
-}
-
-.palette .odd {
- background-color: #ccddff;
-}
-
-.palette .even {
- background-color: #c6d6f4;
-}
-
-.palette .name {
-}
-
-.palette .name:after {
- content: ":";
-}
-
-.palette .option {
-}
-
-.palette .textInput {
- padding: 1px;
- border: 2px inset;
- border-color: #EEE;
-}
-
-.palette a {
- color: #3333FF;
-}
-
-.palette a:hover {
- text-decoration: underline;
-}
-
-.palette a:active {
- color: #0000FF;
-}
+++ /dev/null
-// Copyright (c) 2011 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/**
- * @fileoverview Dygraphs options palette.
- *
- * @author konigsberg@google.com (Robert Konigsberg)
- */
-"use strict";
-
-/**
- * scope is either "global", "series", "x", "y" or "y2".
- */
-function Palette(scope) {
- // Contains pair of "input" (the input object) and "row" (the parent row)
- // Also contains functionString.
- this.model = {};
- // This is meant to be overridden by a palette host.
- this.onchange = function() {};
- this.scope = scope;
- this.root = null;
-}
-
-Palette.prototype.create = function(parentElement) {
- var palette = this;
-
- var table = $("<div>")
- .addClass("palette")
- .width(300)
- .appendTo(parentElement);
-
- this.root = table;
- this.tooltip = new Tooltip();
-
- // One row per option.
- $.each(opts, function(opt, optEntry) {
- try {
- var scope = optEntry.scope || [ "global" ]; // Scope can be empty, infer "global" only.
- var valid = scope[0] == "*" || $.inArray(palette.scope, scope) >= 0;
- if (!valid) {
- return;
- }
-
- var type = optEntry.type;
- var isFunction = type.indexOf("function(") == 0;
-
- var input;
- if (isFunction) {
- input = $("<button>")
- .click(function(opt, palette) {
- return function(event) {
- var entry = palette.model[opt];
- var inputValue = entry.functionString;
- var type = opts[opt].type;
- if (inputValue == null || inputValue.length == 0) {
- inputValue = type + "{\n\n}";
- }
- var textarea = new TextArea();
- textarea.show(opt, inputValue);
- textarea.okCallback = function(value) {
- if (value != inputValue) {
- entry.functionString = value;
- entry.input.textContent = value ? "defined" : "not defined";
- palette.onchange();
- }
- };
- };
- } (opt, palette) // Instantiating this inner function.
- );
- } else if (type == "boolean") {
- input = $("<button>")
- .click(function(event) {
- var btn = event.target;
- if (btn.value == "none") {
- Palette.populateBooleanButton(btn, "true");
- } else if (btn.value == "true") {
- Palette.populateBooleanButton(btn, "false");
- } else {
- Palette.populateBooleanButton(btn, "none");
- }
- palette.onchange();
- });
- } else {
- input = $("<input>", { type: "text" })
- .addClass("textInput")
- .keypress(function(event) {
- var keycode = event.which;
- if (keycode == 13 || keycode == 8) {
- palette.onchange();
- }
- });
- }
-
- var row = $("<div>")
- .append($("<span>").addClass("name").text(opt))
- .append($("<span>").addClass("option")
- .append(input));
-
- row.mouseover(function(source, title, type, body) {
- return function() {
- palette.tooltip.show(source, title, type, body);
- };
- } (row, opt, type, Dygraph.OPTIONS_REFERENCE[opt].description))
- .mouseout(function() { palette.tooltip.hide(); })
-
- row.appendTo(table);
-
- palette.model[opt] = { input: input, row: row };
- } catch(err) {
- throw "For option " + opt + ":" + err;
- }
- });
-
- this.filter("");
-}
-
-// TODO: replace semicolon parsing with comma parsing, and supporting quotes.
-Palette.parseStringArray = function(value) {
- if (value == null || value.length == 0) {
- return null;
- }
- return value.split(";");
-}
-
-Palette.parseBooleanArray = function(value) {
- if (value == null || value.length == 0) {
- return null;
- }
- return value.split(',').map(function(x) {
- return x.trim() == "true";
- });
-}
-
-Palette.parseFloatArray = function(value) {
- if (value == null || value.length == 0) {
- return null;
- }
- return value.split(',').map(function(x) {
- return parseFloat(x);
- });
-}
-
-Palette.parseIntArray = function(value) {
- if (value == null || value.length == 0) {
- return null;
- }
-
- return value.split(',').map(function(x) {
- return parseInt(x);
- });
-}
-
-Palette.prototype.read = function() {
- var results = {};
- for (var opt in this.model) {
- if (this.model.hasOwnProperty(opt)) {
- var type = opts[opt].type;
- var isFunction = type.indexOf("function(") == 0;
- var input = this.model[opt].input[0]; // jquery dereference.
- var value = isFunction ? this.model[opt].functionString : input.value;
- if (value && value.length != 0) {
- if (type == "boolean") {
- if (value == "false") {
- results[opt] = false;
- }
- if (value == "true") {
- results[opt] = true;
- }
- // Ignore value == "none"
- } else if (type == "int") {
- results[opt] = parseInt(value);
- } else if (type == "float") {
- results[opt] = parseFloat(value);
- } else if (type == "array<string>") {
- results[opt] = Palette.parseStringArray(value);
- } else if (type == "array<float>") {
- results[opt] = Palette.parseFloatArray(value);
- } else if (type == "array<boolean>") {
- results[opt] = Palette.parseBooleanArray(value);
- } else if (type == "array<int>") {
- results[opt] = Palette.parseIntArray(value);
- } else if (type == "array<Date>") {
- results[opt] = Palette.parseIntArray(value);
- } else if (isFunction) {
- var localVariable = null;
- eval("localVariable = " + value);
- results[opt] = localVariable;
- } else {
- results[opt] = value;
- }
- }
- }
- }
- return results;
-}
-
-/**
- * Write to input elements.
- */
-Palette.prototype.write = function(hash) {
- if (!hash) {
- return;
- }
- var results = {};
- for (var opt in this.model) {
- if (this.model.hasOwnProperty(opt)) {
- var input = this.model[opt].input[0]; // jquery dereference
- var type = opts[opt].type;
- var value = hash[opt];
- if (type == "boolean") {
- var text = value == true ? "true" : (value == false ? "false" : "none");
- Palette.populateBooleanButton(input, text);
- } else if (type == "array<string>") {
- if (value) {
- input.value = value.join("; ");
- }
- } else if (type.indexOf("array") == 0) {
- if (value) {
- input.value = value.join(", ");
- }
- } else if (type.indexOf("function(") == 0) {
- input.textContent = value ? "defined" : "not defined";
- this.model[opt].functionString = value ? value.toString() : null;
- } else {
- if (value != undefined) {
- input.value = value;
- }
- }
- }
- }
-}
-
-Palette.populateBooleanButton = function(button, value) {
- button.innerHTML = value;
- button.value = value;
-}
-
-Palette.prototype.filter = function(pattern) {
- pattern = pattern.toLowerCase();
- var even = true;
- for (var opt in this.model) {
- if (this.model.hasOwnProperty(opt)) {
- var row = this.model[opt].row;
- var matches = opt.toLowerCase().indexOf(pattern) >= 0;
- row.toggle(matches);
- if (matches) {
- row.attr("class", even ? "even" : "odd");
- even = !even;
- }
- }
- }
-}
+++ /dev/null
-// Copyright (c) 2012 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/**
- * @fileoverview Source samples.
- *
- * @author konigsberg@google.com (Robert Konigsberg)
- */
-
-"use strict";
-
-var Samples = {};
-Samples.data = [
- {
- id: "interestingShapes",
- title: "Interesting Shapes",
- data: function() {
- var zp = function(x) { if (x < 10) return "0"+x; else return x; };
- var r = "date,parabola,line,another line,sine wave\n";
- for (var i=1; i<=31; i++) {
- r += "201110" + zp(i);
- r += "," + 10*(i*(31-i));
- r += "," + 10*(8*i);
- r += "," + 10*(250 - 8*i);
- r += "," + 10*(125 + 125 * Math.sin(0.3*i));
- r += "\n";
- }
- return r;
- },
- options: {
- colors: [
- "rgb(51,204,204)",
- "rgb(255,100,100)",
- "#00DD55",
- "rgba(50,50,200,0.4)"
- ],
- labelsSeparateLines: true,
- labelsKMB: true,
- legend: 'always',
- width: 640,
- height: 480,
- title: 'Interesting Shapes',
- xlabel: 'Date',
- ylabel: 'Count',
- axisLineColor: 'white',
- drawXGrid: false,
-
-// This indentation is intentional; do not fix.
- pointClickCallback: function() {
- alert("p-click!");
-}
- }
- },
-
- {
- id: "sparse",
- title: "Sparse Data",
- data: [
- [ new Date("2009/12/01"), 10, 10, 10],
- [ new Date("2009/12/02"), 15, 11, 12],
- [ new Date("2009/12/03"), null, null, 12],
- [ new Date("2009/12/04"), 20, 14, null],
- [ new Date("2009/12/05"), 15, null, 17],
- [ new Date("2009/12/06"), 18, null, null],
- [ new Date("2009/12/07"), 12, 14, null]
- ],
- options: {
- labels: ["Date", "Series1", "Series2", "Series3"]
- }
- },
-
- {
- id: "manyPoints",
- title: "Dense Data",
- data: function() {
- var numPoints = 1000;
- var numSeries = 100;
-
- var data = [];
- var xmin = 0.0;
- var xmax = 2.0 * Math.PI;
- var adj = .5;
- var delta = (xmax - xmin) / (numPoints - 1);
-
- for (var i = 0; i < numPoints; ++i) {
- var x = xmin + delta * i;
- var elem = [ x ];
- for (var j = 0; j < numSeries; j++) {
- var y = Math.pow(Math.random() - Math.random(), 7);
- elem.push(y);
- }
- data[i] = elem;
- }
- return data;
- },
- options: {
- labelsSeparateLines: true,
- width: 640,
- height: 480,
- title: 'Many Points',
- axisLineColor: 'white',
- }
- },
-
- {
- id: "errorBars",
- title: "Error Bars",
- data: [
- [1, [10, 10, 100]],
- [2, [15, 20, 110]],
- [3, [10, 30, 100]],
- [4, [15, 40, 110]],
- [5, [10, 120, 100]],
- [6, [15, 50, 110]],
- [7, [10, 70, 100]],
- [8, [15, 90, 110]],
- [9, [10, 50, 100]]
- ],
- options: {
- customBars: true,
- errorBars: true
- }
- },
-
- {
- id: "perSeries",
- title: "Per Series Options",
- data: function() {
- var zp = function(x) { if (x < 10) return "0"+x; else return x; };
- var r = "date,parabola,line,another line,sine wave,sine wave2\n";
- for (var i=1; i<=31; i++) {
- r += "200610" + zp(i);
- r += "," + 10*(i*(31-i));
- r += "," + 10*(8*i);
- r += "," + 10*(250 - 8*i);
- r += "," + 10*(125 + 125 * Math.sin(0.3*i));
- r += "," + 10*(125 + 125 * Math.sin(0.3*i+Math.PI));
- r += "\n";
- }
- return r;
- },
- options: {
- strokeWidth: 2,
- series : {
- 'parabola': {
- strokeWidth: 0.0,
- drawPoints: true,
- pointSize: 4,
- highlightCircleSize: 6
- },
- 'line': {
- strokeWidth: 1.0,
- drawPoints: true,
- pointSize: 1.5
- },
- 'sine wave': {
- strokeWidth: 3,
- highlightCircleSize: 10
- },
- 'sine wave2': {
- strokePattern: [10, 2, 5, 2],
- strokeWidth: 2,
- highlightCircleSize: 3
- }
- }
- }
- }
-];
-
-Samples.indexOf = function(id) {
- for (var idx in Samples.data) {
- if (Samples.data[idx].id == id) {
- return idx;
- }
- }
- return null;
-}
+++ /dev/null
-.tooltip {
- position: absolute;
- border: 1px solid black;
- background-color: lightyellow;
- width: 280px;
-}
-
-.tooltip .prompt {
- font-family: Inconsolata, Courier New, Courier;
-}
-
-.tooltip .type {
- font-family: Inconsolata, Courier New, Courier;
- margin-bottom: 0.5em;
- font-size: smaller;
-}
-
-.tooltip .body {
- font-size: smaller;
-}
+++ /dev/null
-// Copyright (c) 2011 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/**
- * @fileoverview Dygraphs options palette tooltip.
- *
- * @author konigsberg@google.com (Robert Konigsberg)
- */
-"use strict";
-
-function Tooltip(parent) {
- if (!parent) {
- parent = $("body")[0];
- }
- this.elem = $("<div>")
- .attr("class", "tooltip")
- .appendTo(parent);
-
- this.title = $("<div>")
- .attr("class", "title")
- .appendTo(this.elem);
-
- this.type = $("<div>")
- .attr("class", "type")
- .appendTo(this.elem);
-
- this.body = $("<div>")
- .attr("class", "body")
- .appendTo(this.elem);
-
- this.hide();
-}
-
-Tooltip.prototype.show = function(source, title, type, body) {
- this.title.html(title);
- this.body.html(body);
- this.type.text(type); // textContent for arrays.
-
- var offset = source.offset();
- this.elem.css({
- "width" : "280",
- "top" : parseInt(offset.top + source[0].offsetHeight) + 'px',
- "left" : parseInt(offset.left + 10) + 'px',
- "visibility" : "visible"});
-}
-
-Tooltip.prototype.hide = function() {
- this.elem.css("visibility", "hidden");
-}
g.updateOptions({
dateWindow: dateWindow
});
- Dygraph.cancelEvent(event);
+ event.preventDefault();
}
},
strokeWidth: 1.5,
gridLineColor: 'rgb(196, 196, 196)',
- drawYGrid: false,
- drawYAxis: false
+ axes: {
+ x: {
+ drawAxis: false
+ },
+ y: {
+ drawGrid: false
+ }
+ }
});
window.onmouseup = finishDraw;
}
var g = new Dygraph(gdiv, data, {
labels: ['x', 'A', 'B'],
- labelDivWidth: 100,
+ labelsDivWidth: 100,
gridLineColor: '#ccc',
includeZero: true,
width: 250,
'8,8, \n' +
'10,10, \n',
{
- labels: ['x', 'A', 'B' ],
connectSeparatedPoints: true,
drawPoints: true
}
<head>
<title>Dygraphs Gallery</title>
- <script src="../dygraph-dev.js"></script>
- <script src="../extras/synchronizer.js"></script>
+ <script src="../dist/dygraph.js"></script>
+ <script src="../src/extras/synchronizer.js"></script>
<script src="lib/jquery-1.4.2.js"></script>
<script src="../common/textarea.js"></script>
function clickV3(event, g, context) {
lastClickedGraph = g;
- Dygraph.cancelEvent(event);
+ event.preventDefault();;
}
function scrollV3(event, g, context) {
var yPct = percentages[1];
zoom(g, percentage, xPct, yPct);
- Dygraph.cancelEvent(event);
+ event.preventDefault();
}
// Adjusts [x, y] toward each other by zoomInPercentage%
},
run: function() {
var lastClickedGraph;
- // TODO(konigsberg): Add cleanup to remove callbacks.
- Dygraph.addEvent(document, "mousewheel", function() { lastClickedGraph = null; });
- Dygraph.addEvent(document, "click", function() { lastClickedGraph = null; });
+ document.addEventListener("mousewheel", function() { lastClickedGraph = null; });
+ document.addEventListener("click", function() { lastClickedGraph = null; });
new Dygraph(document.getElementById("div_g"),
NoisyData, { errorBars : true });
new Dygraph(document.getElementById("div_g2"),
},
underlayCallback : captureCanvas
});
+ },
+ clean: function() {
+ document.removeEventListener('mousewheel');
+ document.removeEventListener('click');
}
});
},
{
strokeWidth: 2,
- 'parabola': {
- strokeWidth: 0.0,
- drawPoints: true,
- pointSize: 4,
- highlightCircleSize: 6
- },
- 'line': {
- strokeWidth: 1.0,
- drawPoints: true,
- pointSize: 1.5
- },
- 'sine wave': {
- strokeWidth: 3,
- highlightCircleSize: 10
+ series: {
+ 'parabola': {
+ strokeWidth: 0.0,
+ drawPoints: true,
+ pointSize: 4,
+ highlightCircleSize: 6
+ },
+ 'line': {
+ strokeWidth: 1.0,
+ drawPoints: true,
+ pointSize: 1.5
+ },
+ 'sine wave': {
+ strokeWidth: 3,
+ highlightCircleSize: 10
+ }
}
}
);
+++ /dev/null
-var gulp = require('gulp');
-var plugins = require('gulp-load-plugins')();
-var karma = require('karma').server;
-var path = require('path');
-
-var dev = false;
-var src = {
- base: "src",
- polyfills: {
- base: "src/polyfills",
- files: [
- "console.js",
- "dashed-canvas.js"
- ]
- },
- main: {
- base: "src",
- files: [
- "dygraph-options.js",
- "dygraph-layout.js",
- "dygraph-canvas.js",
- "dygraph.js",
- "dygraph-utils.js",
- "dygraph-gviz.js",
- "dygraph-interaction-model.js",
- "dygraph-tickers.js",
- "dygraph-plugin-base.js"
- ]
- } ,
- plugins: {
- base: "src/plugins",
- files: [
- "annotations.js",
- "axes.js",
- "chart-labels.js",
- "grid.js",
- "legend.js",
- "range-selector.js",
- "../dygraph-plugin-install.js"
- ]
- },
- // Only used by dynamic loader
- devOptions: {
- base: "src",
- files: ["dygraph-options-reference.js"]
- },
- datahandlers: {
- base: "src/datahandler",
- files: [
- "datahandler.js",
- "default.js",
- "default-fractions.js",
- "bars.js",
- "bars-error.js",
- "bars-custom.js",
- "bars-fractions.js"
- ]
- }
-};
-
-// Convenience function to merge multiple arrays into one
-var mergePaths = function() {
- var paths = [];
- var pathobj = null;
- if (arguments.length > 0) {
- for (var i = 0; i < arguments.length; i++) {
- pathObj = arguments[i];
- pathObj.files.map(function(filename) {
- paths.push(path.join(pathObj.base, filename));
- });
- }
-
- return paths;
- } else {
- return [];
- }
-};
-
-var copyright = '/*! @license Copyright 2015 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */';
-
-/*
-// Creates the dygraph-autoloader
-gulp.task('create-loader', function() {
- // Create string ready for javascript array
- var files = mergePaths(src.lib, src.main, src.plugins, src.devOptions, src.datahandlers)
- .map(function(filename) {
- // Make the path relative to dist file and add quotes
- return "'" + filename.replace(src.base, '../../' + src.base) + "'";
- })
- .join(",");
-
- return gulp.src(src.base + '../dygraph/dygraph-autoloader.js')
- .pipe(plugins.replace(/\/\* REPLACEME \*\//, files))
- .pipe(gulp.dest('dist/scratch'));
-});
-*/
-
-gulp.task('create-dev', function() {
- var dest = 'dist';
- return gulp.src(mergePaths(src.polyfills, src.main, src.plugins, src.devOptions, src.datahandlers), {base: '.'})
- .pipe(plugins.sourcemaps.init({debug:true}))
- .pipe(plugins.concat('dygraph-combined-dev.js'))
- .pipe(plugins.header(copyright))
- .pipe(plugins.sourcemaps.write('.')) // '.' = external sourcemap
- .pipe(gulp.dest(dest));
-});
-
-gulp.task('concat', function() {
- var dest = 'dist';
- return gulp.src(mergePaths(src.polyfills, src.main, src.plugins, src.datahandlers), {base: '.'})
- .pipe(plugins.sourcemaps.init())
- .pipe(plugins.concat('scratch'))
- .pipe(plugins.header(copyright))
- .pipe(gulp.dest(dest))
- .pipe(plugins.uglify({
- compress: {
- global_defs: { DEBUG: false }
- },
- warnings: false,
- preserveComments: "none"
- }))
- .pipe(plugins.header(copyright))
- .pipe(plugins.rename('dygraph-combined.js'))
- .pipe(plugins.sourcemaps.write('.'))
- .pipe(gulp.dest(dest));
-
-});
-
-gulp.task('gwt-dist', ['concat'], function() {
- // Copy package structure to dist folder
- gulp.src('gwt/**', {'base': '.'})
- .pipe(gulp.dest('dist'));
-
- gulp.src('dygraph-combined.js')
- .pipe(gulp.dest('dist/gwt/org/danvk'));
-
- // Generate jar
- gulp.src('')
- .pipe(plugins.shell([
- 'bash -c "jar -cf dist/dygraph-gwt.jar -C dist/gwt org"'
- ]))
-});
-
-gulp.task('test', ['concat', 'create-dev'], function(done) {
- karma.start({
- configFile: process.cwd() + '/auto_tests/karma.conf.js',
- singleRun: true
- }, done);
-});
-
-gulp.task('coveralls', ['test'], plugins.shell.task([
- './scripts/transform-coverage.js ' +
- 'dist/dygraph-combined-dev.js.map ' +
- 'dist/coverage/report-lcov/lcov.info ' +
- '| ./node_modules/.bin/coveralls'
-]));
-
-gulp.task('watch', function() {
- gulp.watch('src/**', ['concat']);
-});
-
-gulp.task('watch-test', function() {
- gulp.watch(['src/**', 'auto_tests/tests/**'], ['test']);
-});
-
-gulp.task('dist', ['gwt-dist', 'concat', 'create-dev']);
-gulp.task('travis', ['test', 'coveralls']);
-gulp.task('default', ['test', 'dist']);
"name": "dygraphs",
"version": "1.1.0",
"description": "dygraphs is a fast, flexible open source JavaScript charting library.",
- "main": "dygraph-combined-dev.js",
+ "main": "dist/src/dygraph.js",
"directories": {
"doc": "docs",
"test": "tests"
},
"homepage": "https://github.com/danvk/dygraphs",
"devDependencies": {
- "closure-compiler": "^0.2.6",
+ "babel": "^5.8.23",
+ "babel-core": "^5.8.25",
+ "babelify": "^6.3.0",
+ "browserify": "^11.2.0",
+ "browserify-header": "^0.9.2",
+ "chai": "^3.3.0",
"coveralls": "^2.11.2",
- "gulp": "^3.8.10",
- "gulp-concat": "^2.4.3",
- "gulp-eslint": "^0.2.0",
- "gulp-header": "^1.2.2",
- "gulp-load-plugins": "^0.8.0",
- "gulp-rename": "^1.2.0",
- "gulp-replace": "^0.5.0",
- "gulp-shell": "^0.4.0",
- "gulp-sourcemaps": "^1.3.0",
- "gulp-uglify": "^1.0.2",
+ "envify": "^3.4.0",
+ "exorcist": "^0.4.0",
+ "http-server": "^0.8.5",
+ "istanbul": "^0.4.0",
"jshint": "^2.5.10",
- "karma": "^0.12.31",
- "karma-chai-plugins": "^0.2.4",
- "karma-chrome-launcher": "^0.1.7",
- "karma-coverage": "^0.2.7",
- "karma-firefox-launcher": "^0.1.4",
- "karma-mocha": "^0.1.10",
- "karma-mocha-reporter": "^1.0.2",
- "karma-phantomjs-launcher": "^0.1.4",
- "karma-spec-reporter": "0.0.16",
"lcov-parse": "0.0.9",
"mocha": "^2.1.0",
+ "mocha-phantomjs": "3.5.3",
+ "mocha-phantomjs-istanbul": "0.0.2",
"obvious-closure-library": "^20140401.0.2",
"parse-data-uri": "^0.2.0",
"phantomjs": "^1.9.7-8",
"pre-commit": "^1.0.6",
"source-map": "^0.4.2",
- "uglify-js": "^2"
+ "uglify-js": "^2.5.0",
+ "watchify": "^3.4.0"
},
"scripts": {
- "test": "make test",
+ "build": "./scripts/build.sh",
+ "coverage": "./scripts/generate-coverage.sh",
+ "watch": "./scripts/watch.sh",
+ "build-tests": "./scripts/build-tests.sh",
+ "test": "./scripts/run-tests.sh",
"tests-ok": "./scripts/check-no-only.sh"
},
"pre-commit": [
--- /dev/null
+#!/bin/bash
+# Create dist/tests.js
+# To run the tests, run `npm run test`
+# To iterate on the tests, use `npm run watch`
+
+browserify \
+ -v \
+ -t babelify \
+ -t [ envify --NODE_ENV development ] \
+ --debug \
+ -o dist/tests.js \
+ auto_tests/tests/*.js
--- /dev/null
+#!/bin/bash
+# This generates:
+# - dist/dygraph.js
+# - dist/dygraph.js.map
+# - dist/dygraph.min.js
+# - dist/dygraph.min.js.map
+set -o errexit
+
+mkdir -p dist
+
+# Create dist/dygraph.js
+browserify \
+ -v \
+ -t babelify \
+ -t [ envify --NODE_ENV development ] \
+ --debug \
+ --standalone Dygraph \
+ src/dygraph.js \
+ > dist/dygraph.tmp.js
+
+# Create dist/dygraph.js.map
+cat dist/dygraph.tmp.js | exorcist --base . dist/dygraph.js.map > dist/dygraph.js
+
+# Create "production" bundle for minification
+browserify \
+ -v \
+ -t babelify \
+ -t [ envify --NODE_ENV production ] \
+ --debug \
+ --standalone Dygraph \
+ src/dygraph.js \
+ > dist/dygraph.tmp.js
+
+# Create dist/dygraph.tmp.js.map
+cat dist/dygraph.tmp.js | exorcist --base . dist/dygraph.tmp.js.map > /dev/null
+
+header='/*! @license Copyright 2014 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
+
+# Create dist/dygraph.js.min{,.map}
+uglifyjs --compress --mangle \
+ --preamble "$header" \
+ --in-source-map dist/dygraph.tmp.js.map \
+ --source-map-include-sources \
+ --source-map dist/dygraph.min.js.map \
+ -o dist/dygraph.min.js \
+ dist/dygraph.tmp.js
+
+# Copy to the old location
+cp dist/dygraph.min.js dist/dygraph-combined.js
+
+# Build GWT JAR
+jar -cf dist/dygraph-gwt.jar -C gwt org
+
+# Remove temp files.
+rm dist/dygraph.tmp.js
+rm dist/dygraph.tmp.js.map
--- /dev/null
+// This script can be used to check for errors/console warnings in _all_ the
+// files in tests/*.html.
+//
+// Suggested usage:
+//
+// npm install casperjs
+// for x in tests/*.html; casperjs scripts/casperscript.js $x
+
+var casper = require('casper').create({
+ verbose: true
+});
+var filename = casper.cli.args[0];
+
+casper.echo(filename);
+casper.on('remote.message', function(message) {
+ this.echo('page console: ' + message);
+});
+
+casper.on('resource.error', function(e) {
+ this.echo('resource.error: ' + e);
+});
+casper.on('page.error', function(e) {
+ this.echo('error! ' + e);
+});
+
+casper.start(filename, function() { });
+
+casper.run();
--- /dev/null
+#!/bin/bash
+# Generate code coverage data for posting to Coveralls.
+# This requires dist/*.js to be in place.
+# Output is coverage/lcov.info
+
+set -o errexit
+set -x
+
+# Generate per-file ES6 --> ES5 transpilations
+babel --retain-lines src --out-dir dist/src
+babel --retain-lines auto_tests/tests --out-dir dist/auto_tests/tests
+
+# Instrument the source code with Istanbul's __coverage__ variable.
+rm -rf coverage/* # Clear out everything to ensure a hermetic run.
+mkdir -p coverage
+istanbul instrument --output coverage/src dist/src
+cp -r dist/auto_tests coverage/
+
+# Build a combined file for running the tests in-browser
+browserify coverage/auto_tests/tests/*.js -o coverage/tests.js
+
+# Run http-server and save its PID for cleanup
+http-server > /dev/null &
+SERVER_PID=$!
+function finish() {
+ kill -TERM $SERVER_PID
+}
+trap finish EXIT
+
+# Give the server a chance to start up
+sleep 1
+
+# Run the tests using mocha-phantomjs & mocha-phantomjs-istanbul
+# This produces coverage/coverage.json
+phantomjs \
+ ./node_modules/mocha-phantomjs/lib/mocha-phantomjs.coffee \
+ http://localhost:8080/auto_tests/coverage.html \
+ spec '{"hooks": "mocha-phantomjs-istanbul", "coverageFile": "coverage/coverage.json"}'
+
+if [ $CI ]; then
+ # Convert the JSON coverage to LCOV for coveralls.
+ istanbul report --include coverage/*.json lcovonly
+
+ # Monkey patch in the untransformed source paths.
+ perl -i -pe 's,dist/,,' coverage/lcov.info
+ echo '' # reset exit code -- failure to post coverage shouldn't be an error.
+
+else
+
+ # Convert the JSON coverage to HTML for viewing
+ istanbul report --include coverage/*.json html
+ set +x
+
+ echo 'To browse coverage, run:'
+ echo
+ echo ' open coverage/index.html'
+ echo
+
+fi
--- /dev/null
+#!/bin/bash
+cat coverage/lcov.info | ./node_modules/.bin/coveralls
+
+echo '' # reset exit code -- failure to post coverage shouldn't be an error.
--- /dev/null
+#!/bin/bash
+# Starts the http-server and runs mocha-phantomjs-based tests
+# Note that you must run `npm run build` or `npm run watch` before running this.
+set -o errexit
+
+# Run http-server and save its PID
+http-server -p 8081 > /dev/null &
+SERVER_PID=$!
+function finish() {
+ kill -TERM $SERVER_PID
+}
+trap finish EXIT
+
+# the following sleep step is not really necessary
+# as http-server starts almost instantenously;
+# but letting the server settle might help prevent
+# possible racing conditions
+sleep 1
+
+# Start the tests
+mocha-phantomjs http://localhost:8081/auto_tests/runner.html
+++ /dev/null
-#!/usr/bin/env node
-/**
- * This script applies a source map to LCOV data. If you have coverage data for
- * a concatenated file, plus a source map, this will output LCOV data for your
- * original source files.
- *
- * Usage:
- *
- * transform-coverage.js path/to/soure.map path/to/coverage.lcov > out.lcov
- */
-
-// TODO: make this a command line argument
-var SOURCE = 'src/'; // only report files under this directory
-
-var assert = require('assert'),
- fs = require('fs'),
- lcovParse = require('lcov-parse'),
- parseDataUri = require('parse-data-uri'),
- sourcemap = require('source-map');
-
-var sourcemapFile = process.argv[2];
-var lcovFile = process.argv[3];
-
-var sourcemapData = fs.readFileSync(sourcemapFile).toString();
-var sourcemap = new sourcemap.SourceMapConsumer(sourcemapData);
-
-lcovParse(lcovFile, function(err, data) {
- assert(!err);
- // TODO: 0 --> the correct file
- var lines = data[0].lines.details;
-
- var fileToCov = {}; // filename -> { line num -> hits }
-
- lines.forEach(function(line) {
- var pos = sourcemap.originalPositionFor({line: line.line, column: 0});
- if (pos == null) {
- return;
- }
-
- var filename = pos.source;
-
- // Test coverage of node_modules is never interesting.
- if (!filename || filename.indexOf('node_modules') >= 0) {
- return;
- }
-
- // Strip paths down to the source root.
- var base = filename.indexOf(SOURCE);
- if (base == -1) return;
- filename = filename.slice(base);
-
- if (!fileToCov[filename]) fileToCov[filename] = [];
- fileToCov[filename][pos.line] = line.hit;
- });
-
- // Other LCOV fields to translate:
- // FN:2454
- // FNF:465
- // FNH:410
- // FNDA:1,(anonymous_1)
- // LF:4570
- // LH:4002
- // BRDA:13,1,0,1
- // BRF:2213
- // BRH:1684
-
- // Convert to LCOV format
- for (var filename in fileToCov) {
- var cov = fileToCov[filename]
- console.log('SF:' + filename);
- for (var i = 0; i < cov.length; i++) {
- if (cov[i] != null) {
- console.log('DA:' + i + ',' + cov[i]);
- }
- }
- console.log('end_of_record');
- }
-});
--- /dev/null
+#!/bin/bash
+# Continually regenerate these two files:
+# - dist/dygraph.js
+# - dist/tests.js
+# As source/test files change.
+
+# Clean background processes after quit
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+
+mkdir -p dist # in case it doesn't exist; watchify needs it
+
+watchify \
+ -v \
+ -t babelify \
+ -t [ envify --NODE_ENV development ] \
+ --debug \
+ --standalone Dygraph \
+ -o dist/dygraph.js \
+ src/dygraph.js &
+
+watchify \
+ -v \
+ -t babelify \
+ -t [ envify --NODE_ENV development ] \
+ --debug \
+ -o dist/tests.js \
+ auto_tests/tests/*.js &
+
+# Wait until background processes end
+wait
* @author David Eberlein (david.eberlein@ch.sauter-bc.com)
*/
-(function() {
-
/*global Dygraph:false */
"use strict";
+import BarsHandler from './bars';
+
/**
* @constructor
* @extends Dygraph.DataHandlers.BarsHandler
*/
-Dygraph.DataHandlers.CustomBarsHandler = function() {
+var CustomBarsHandler = function() {
};
-var CustomBarsHandler = Dygraph.DataHandlers.CustomBarsHandler;
-CustomBarsHandler.prototype = new Dygraph.DataHandlers.BarsHandler();
+CustomBarsHandler.prototype = new BarsHandler();
/** @inheritDoc */
CustomBarsHandler.prototype.extractSeries = function(rawData, i, options) {
return rollingData;
};
-})();
+export default CustomBarsHandler;
* @author David Eberlein (david.eberlein@ch.sauter-bc.com)
*/
-(function() {
-
/*global Dygraph:false */
"use strict";
+import BarsHandler from './bars';
+
/**
* @constructor
- * @extends Dygraph.DataHandlers.BarsHandler
+ * @extends BarsHandler
*/
-Dygraph.DataHandlers.ErrorBarsHandler = function() {
+var ErrorBarsHandler = function() {
};
-var ErrorBarsHandler = Dygraph.DataHandlers.ErrorBarsHandler;
-ErrorBarsHandler.prototype = new Dygraph.DataHandlers.BarsHandler();
+ErrorBarsHandler.prototype = new BarsHandler();
/** @inheritDoc */
ErrorBarsHandler.prototype.extractSeries = function(rawData, i, options) {
return rollingData;
};
-})();
+export default ErrorBarsHandler;
* @author David Eberlein (david.eberlein@ch.sauter-bc.com)
*/
-(function() {
-
/*global Dygraph:false */
"use strict";
+import BarsHandler from './bars';
+
/**
* @constructor
* @extends Dygraph.DataHandlers.BarsHandler
*/
-Dygraph.DataHandlers.FractionsBarsHandler = function() {
+var FractionsBarsHandler = function() {
};
-var FractionsBarsHandler = Dygraph.DataHandlers.FractionsBarsHandler;
-FractionsBarsHandler.prototype = new Dygraph.DataHandlers.BarsHandler();
+FractionsBarsHandler.prototype = new BarsHandler();
/** @inheritDoc */
FractionsBarsHandler.prototype.extractSeries = function(rawData, i, options) {
return rollingData;
};
-})();
+export default FractionsBarsHandler;
* @author David Eberlein (david.eberlein@ch.sauter-bc.com)
*/
-(function() {
-
/*global Dygraph:false */
/*global DygraphLayout:false */
"use strict";
+import DygraphDataHandler from './datahandler';
+import DygraphLayout from '../dygraph-layout';
+
/**
* @constructor
* @extends {Dygraph.DataHandler}
*/
-Dygraph.DataHandlers.BarsHandler = function() {
- Dygraph.DataHandler.call(this);
+var BarsHandler = function() {
+ DygraphDataHandler.call(this);
};
-Dygraph.DataHandlers.BarsHandler.prototype = new Dygraph.DataHandler();
-
-// alias for the rest of the implementation
-var BarsHandler = Dygraph.DataHandlers.BarsHandler;
+BarsHandler.prototype = new DygraphDataHandler();
// TODO(danvk): figure out why the jsdoc has to be copy/pasted from superclass.
// (I get closure compiler errors if this isn't here.)
var point = points[i];
point.y_top = NaN;
point.y_bottom = NaN;
- point.yval_minus = Dygraph.DataHandler.parseFloat(item[2][0]);
- point.yval_plus = Dygraph.DataHandler.parseFloat(item[2][1]);
+ point.yval_minus = DygraphDataHandler.parseFloat(item[2][0]);
+ point.yval_plus = DygraphDataHandler.parseFloat(item[2][1]);
}
};
}
};
-})();
+export default BarsHandler;
/*global Dygraph:false */
/*global DygraphLayout:false */
+"use strict";
+
/**
*
* The data handler is responsible for all data specific operations. All of the
* Initially the unified data is created by the extractSeries method
* @constructor
*/
-Dygraph.DataHandler = function () {
+var DygraphDataHandler = function () {
};
-/**
- * A collection of functions to create and retrieve data handlers.
- * @type {Object.<!Dygraph.DataHandler>}
- */
-Dygraph.DataHandlers = {};
-
-(function() {
-
-"use strict";
-
-var handler = Dygraph.DataHandler;
+var handler = DygraphDataHandler;
/**
* X-value array index constant for unified data samples.
return val;
};
-})();
+export default DygraphDataHandler;
* @author David Eberlein (david.eberlein@ch.sauter-bc.com)
*/
-(function() {
-
/*global Dygraph:false */
"use strict";
+import DygraphDataHandler from './datahandler';
+import DefaultHandler from './default';
+
/**
- * @extends Dygraph.DataHandlers.DefaultHandler
+ * @extends DefaultHandler
* @constructor
*/
-Dygraph.DataHandlers.DefaultFractionHandler = function() {
+var DefaultFractionHandler = function() {
};
-var DefaultFractionHandler = Dygraph.DataHandlers.DefaultFractionHandler;
-DefaultFractionHandler.prototype = new Dygraph.DataHandlers.DefaultHandler();
+DefaultFractionHandler.prototype = new DefaultHandler();
DefaultFractionHandler.prototype.extractSeries = function(rawData, i, options) {
// TODO(danvk): pre-allocate series here.
return rollingData;
};
-})();
+export default DefaultFractionHandler;
* @author David Eberlein (david.eberlein@ch.sauter-bc.com)
*/
-(function() {
-
/*global Dygraph:false */
"use strict";
+import DygraphDataHandler from './datahandler';
+
/**
* @constructor
* @extends Dygraph.DataHandler
*/
-Dygraph.DataHandlers.DefaultHandler = function() {
+var DefaultHandler = function() {
};
-var DefaultHandler = Dygraph.DataHandlers.DefaultHandler;
-DefaultHandler.prototype = new Dygraph.DataHandler();
+DefaultHandler.prototype = new DygraphDataHandler();
/** @inheritDoc */
DefaultHandler.prototype.extractSeries = function(rawData, i, options) {
return [ minY, maxY ];
};
-})();
+export default DefaultHandler;
* @constructor
*/
-var DygraphCanvasRenderer = (function() {
/*global Dygraph:false */
"use strict";
+import * as utils from './dygraph-utils';
+import Dygraph from './dygraph';
+
/**
* @constructor
this.width = dygraph.width_;
// --- check whether everything is ok before we return
- if (!Dygraph.isCanvasSupported(this.element)) {
+ if (!utils.isCanvasSupported(this.element)) {
throw "Canvas is not supported.";
}
// This ensures that we don't overdraw.
// on Android 3 and 4, setting a clipping area on a canvas prevents it from
// displaying anything.
- if (!Dygraph.isAndroid()) {
+ if (!utils.isAndroid()) {
var ctx = this.dygraph_.canvas_ctx_;
ctx.beginPath();
ctx.rect(this.area.x, this.area.y, this.area.w, this.area.h);
// TODO(konigsberg): Compute attributes outside this method call.
var stepPlot = g.getBooleanOption("stepPlot", e.setName);
- if (!Dygraph.isArrayLike(strokePattern)) {
+ if (!utils.isArrayLike(strokePattern)) {
strokePattern = null;
}
var points = e.points;
var setName = e.setName;
- var iter = Dygraph.createIterator(points, 0, points.length,
+ var iter = utils.createIterator(points, 0, points.length,
DygraphCanvasRenderer._getIteratorPredicate(
g.getBooleanOption("connectSeparatedPoints", setName)));
var ctx = e.drawingContext;
ctx.save();
if (stroking) {
- ctx.installPattern(strokePattern);
+ if (ctx.setLineDash) ctx.setLineDash(strokePattern);
}
var pointsOnLine = DygraphCanvasRenderer._drawSeries(
e, pointsOnLine, drawPointCallback, color, pointSize);
if (stroking) {
- ctx.uninstallPattern();
+ if (ctx.setLineDash) ctx.setLineDash([]);
}
ctx.restore();
// Determine which series have specialized plotters.
var plotter_attr = this.dygraph_.getOption("plotter");
var plotters = plotter_attr;
- if (!Dygraph.isArrayLike(plotters)) {
+ if (!utils.isArrayLike(plotters)) {
plotters = [plotters];
}
// this code a bit nasty.
var borderWidth = g.getNumericOption("strokeBorderWidth", setName);
var drawPointCallback = g.getOption("drawPointCallback", setName) ||
- Dygraph.Circles.DEFAULT;
+ utils.Circles.DEFAULT;
var strokePattern = g.getOption("strokePattern", setName);
var drawPoints = g.getBooleanOption("drawPoints", setName);
var pointSize = g.getNumericOption("pointSize", setName);
var stepPlot = g.getBooleanOption("stepPlot", setName);
var points = e.points;
- var iter = Dygraph.createIterator(points, 0, points.length,
+ var iter = utils.createIterator(points, 0, points.length,
DygraphCanvasRenderer._getIteratorPredicate(
g.getBooleanOption("connectSeparatedPoints", setName)));
var prevY = NaN;
var prevYs = [-1, -1];
// should be same color as the lines but only 15% opaque.
- var rgb = Dygraph.toRGB_(color);
+ var rgb = utils.toRGB_(color);
var err_color =
'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' + fillAlpha + ')';
ctx.fillStyle = err_color;
axisY = area.h * axisY + area.y;
var points = sets[setIdx];
- var iter = Dygraph.createIterator(points, 0, points.length,
+ var iter = utils.createIterator(points, 0, points.length,
DygraphCanvasRenderer._getIteratorPredicate(
g.getBooleanOption("connectSeparatedPoints", setName)));
var prevYs = [-1, -1];
var newYs;
// should be same color as the lines but only 15% opaque.
- var rgb = Dygraph.toRGB_(color);
+ var rgb = utils.toRGB_(color);
var err_color =
'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' + fillAlpha + ')';
ctx.fillStyle = err_color;
var point;
while (iter.hasNext) {
point = iter.next();
- if (!Dygraph.isOK(point.y) && !stepPlot) {
+ if (!utils.isOK(point.y) && !stepPlot) {
traceBackPath(ctx, prevX, prevYs[1], pathBack);
pathBack = [];
prevX = NaN;
}
};
-return DygraphCanvasRenderer;
-
-})();
+export default DygraphCanvasRenderer;
+++ /dev/null
-This is not the file you are looking for.
-A reasonably up-to-date version can be found at http://dygraphs.com/dygraph-combined.js
-
-dygraph-combined.js is a "packed" version of the larger dygraphs JS files. It is
-smaller and loads more quickly, but is harder to debug.
-
-To generate this file, run "make" or generate-combined.sh.
--- /dev/null
+'use strict'
+
+import * as DygraphTickers from './dygraph-tickers';
+import DygraphInteraction from './dygraph-interaction-model';
+import DygraphCanvasRenderer from './dygraph-canvas';
+import * as utils from './dygraph-utils';
+
+// Default attribute values.
+var DEFAULT_ATTRS = {
+ highlightCircleSize: 3,
+ highlightSeriesOpts: null,
+ highlightSeriesBackgroundAlpha: 0.5,
+
+ labelsDivWidth: 250,
+ labelsDivStyles: {
+ // TODO(danvk): move defaults from createStatusMessage_ here.
+ },
+ labelsSeparateLines: false,
+ labelsShowZeroValues: true,
+ labelsKMB: false,
+ labelsKMG2: false,
+ showLabelsOnHighlight: true,
+
+ digitsAfterDecimal: 2,
+ maxNumberWidth: 6,
+ sigFigs: null,
+
+ strokeWidth: 1.0,
+ strokeBorderWidth: 0,
+ strokeBorderColor: "white",
+
+ axisTickSize: 3,
+ axisLabelFontSize: 14,
+ rightGap: 5,
+
+ showRoller: false,
+ xValueParser: undefined,
+
+ delimiter: ',',
+
+ sigma: 2.0,
+ errorBars: false,
+ fractions: false,
+ wilsonInterval: true, // only relevant if fractions is true
+ customBars: false,
+ fillGraph: false,
+ fillAlpha: 0.15,
+ connectSeparatedPoints: false,
+
+ stackedGraph: false,
+ stackedGraphNaNFill: 'all',
+ hideOverlayOnMouseOut: true,
+
+ legend: 'onmouseover',
+ stepPlot: false,
+ avoidMinZero: false,
+ xRangePad: 0,
+ yRangePad: null,
+ drawAxesAtZero: false,
+
+ // Sizes of the various chart labels.
+ titleHeight: 28,
+ xLabelHeight: 18,
+ yLabelWidth: 18,
+
+ axisLineColor: "black",
+ axisLineWidth: 0.3,
+ gridLineWidth: 0.3,
+ axisLabelColor: "black",
+ axisLabelWidth: 50,
+ gridLineColor: "rgb(128,128,128)",
+
+ interactionModel: DygraphInteraction.defaultModel,
+ animatedZooms: false, // (for now)
+
+ // Range selector options
+ showRangeSelector: false,
+ rangeSelectorHeight: 40,
+ rangeSelectorPlotStrokeColor: "#808FAB",
+ rangeSelectorPlotFillGradientColor: "white",
+ rangeSelectorPlotFillColor: "#A7B1C4",
+ rangeSelectorBackgroundStrokeColor: "gray",
+ rangeSelectorBackgroundLineWidth: 1,
+ rangeSelectorPlotLineWidth:1.5,
+ rangeSelectorForegroundStrokeColor: "black",
+ rangeSelectorForegroundLineWidth: 1,
+ rangeSelectorAlpha: 0.6,
+ showInRangeSelector: null,
+
+ // The ordering here ensures that central lines always appear above any
+ // fill bars/error bars.
+ plotter: [
+ DygraphCanvasRenderer._fillPlotter,
+ DygraphCanvasRenderer._errorPlotter,
+ DygraphCanvasRenderer._linePlotter
+ ],
+
+ plugins: [ ],
+
+ // per-axis options
+ axes: {
+ x: {
+ pixelsPerLabel: 70,
+ axisLabelWidth: 60,
+ axisLabelFormatter: utils.dateAxisLabelFormatter,
+ valueFormatter: utils.dateValueFormatter,
+ drawGrid: true,
+ drawAxis: true,
+ independentTicks: true,
+ ticker: DygraphTickers.dateTicker
+ },
+ y: {
+ axisLabelWidth: 50,
+ pixelsPerLabel: 30,
+ valueFormatter: utils.numberValueFormatter,
+ axisLabelFormatter: utils.numberAxisLabelFormatter,
+ drawGrid: true,
+ drawAxis: true,
+ independentTicks: true,
+ ticker: DygraphTickers.numericTicks
+ },
+ y2: {
+ axisLabelWidth: 50,
+ pixelsPerLabel: 30,
+ valueFormatter: utils.numberValueFormatter,
+ axisLabelFormatter: utils.numberAxisLabelFormatter,
+ drawAxis: true, // only applies when there are two axes of data.
+ drawGrid: false,
+ independentTicks: false,
+ ticker: DygraphTickers.numericTicks
+ }
+ }
+};
+
+export default DEFAULT_ATTRS;
* - http://dygraphs.com/tests/annotation-gviz.html
*/
-(function() {
/*global Dygraph:false */
"use strict";
+import Dygraph from './dygraph';
+
/**
* A wrapper around Dygraph that implements the gviz API.
* @param {!HTMLDivElement} container The DOM object the visualization should
* live in.
* @constructor
*/
-Dygraph.GVizChart = function(container) {
+var GVizChart = function(container) {
this.container = container;
};
* @param {GVizDataTable} data
* @param {Object.<*>} options
*/
-Dygraph.GVizChart.prototype.draw = function(data, options) {
+GVizChart.prototype.draw = function(data, options) {
// Clear out any existing dygraph.
// TODO(danvk): would it make more sense to simply redraw using the current
// date_graph object?
* @param {Array.<{row:number}>} selection_array array of the selected cells
* @public
*/
-Dygraph.GVizChart.prototype.setSelection = function(selection_array) {
+GVizChart.prototype.setSelection = function(selection_array) {
var row = false;
if (selection_array.length) {
row = selection_array[0].row;
* @return {Array.<{row:number,column:number}>} array of the selected cells
* @public
*/
-Dygraph.GVizChart.prototype.getSelection = function() {
+GVizChart.prototype.getSelection = function() {
var selection = [];
var row = this.date_graph.getSelection();
return selection;
};
-})();
+export default GVizChart;
* @author Robert Konigsberg (konigsberg@google.com)
*/
-(function() {
/*global Dygraph:false */
"use strict";
+import * as utils from './dygraph-utils';
+
/**
* You can drag this many pixels past the edge of the chart and still have it
* be considered a zoom. This makes it easier to zoom to the exact edge of the
* A collection of functions to facilitate build custom interaction models.
* @class
*/
-Dygraph.Interaction = {};
+var DygraphInteraction = {};
/**
* Checks whether the beginning & ending of an event were close enough that it
* @param {Dygraph} g
* @param {Object} context
*/
-Dygraph.Interaction.maybeTreatMouseOpAsClick = function(event, g, context) {
- context.dragEndX = Dygraph.dragGetX_(event, context);
- context.dragEndY = Dygraph.dragGetY_(event, context);
+DygraphInteraction.maybeTreatMouseOpAsClick = function(event, g, context) {
+ context.dragEndX = utils.dragGetX_(event, context);
+ context.dragEndY = utils.dragGetY_(event, context);
var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
if (regionWidth < 2 && regionHeight < 2 &&
g.lastx_ !== undefined && g.lastx_ != -1) {
- Dygraph.Interaction.treatMouseOpAsClick(g, event, context);
+ DygraphInteraction.treatMouseOpAsClick(g, event, context);
}
context.regionWidth = regionWidth;
* dragStartX/dragStartY/etc. properties). This function modifies the
* context.
*/
-Dygraph.Interaction.startPan = function(event, g, context) {
+DygraphInteraction.startPan = function(event, g, context) {
var i, axis;
context.isPanning = true;
var xRange = g.xAxisRange();
if (g.getOptionForAxis("logscale", "x")) {
- context.initialLeftmostDate = Dygraph.log10(xRange[0]);
- context.dateRange = Dygraph.log10(xRange[1]) - Dygraph.log10(xRange[0]);
+ context.initialLeftmostDate = utils.log10(xRange[0]);
+ context.dateRange = utils.log10(xRange[1]) - utils.log10(xRange[0]);
} else {
context.initialLeftmostDate = xRange[0];
context.dateRange = xRange[1] - xRange[0];
// In log scale, initialTopValue, dragValueRange and unitsPerPixel are log scale.
var logscale = g.attributes_.getForAxis("logscale", i);
if (logscale) {
- axis_data.initialTopValue = Dygraph.log10(yRange[1]);
- axis_data.dragValueRange = Dygraph.log10(yRange[1]) - Dygraph.log10(yRange[0]);
+ axis_data.initialTopValue = utils.log10(yRange[1]);
+ axis_data.dragValueRange = utils.log10(yRange[1]) - utils.log10(yRange[0]);
} else {
axis_data.initialTopValue = yRange[1];
axis_data.dragValueRange = yRange[1] - yRange[0];
* dragStartX/dragStartY/etc. properties). This function modifies the
* context.
*/
-Dygraph.Interaction.movePan = function(event, g, context) {
- context.dragEndX = Dygraph.dragGetX_(event, context);
- context.dragEndY = Dygraph.dragGetY_(event, context);
+DygraphInteraction.movePan = function(event, g, context) {
+ context.dragEndX = utils.dragGetX_(event, context);
+ context.dragEndY = utils.dragGetY_(event, context);
var minDate = context.initialLeftmostDate -
(context.dragEndX - context.dragStartX) * context.xUnitsPerPixel;
}
if (g.getOptionForAxis("logscale", "x")) {
- g.dateWindow_ = [ Math.pow(Dygraph.LOG_SCALE, minDate),
- Math.pow(Dygraph.LOG_SCALE, maxDate) ];
+ g.dateWindow_ = [ Math.pow(utils.LOG_SCALE, minDate),
+ Math.pow(utils.LOG_SCALE, maxDate) ];
} else {
g.dateWindow_ = [minDate, maxDate];
}
}
}
if (g.attributes_.getForAxis("logscale", i)) {
- axis.valueWindow = [ Math.pow(Dygraph.LOG_SCALE, minValue),
- Math.pow(Dygraph.LOG_SCALE, maxValue) ];
+ axis.valueWindow = [ Math.pow(utils.LOG_SCALE, minValue),
+ Math.pow(utils.LOG_SCALE, maxValue) ];
} else {
axis.valueWindow = [ minValue, maxValue ];
}
* dragStartX/dragStartY/etc. properties). This function modifies the
* context.
*/
-Dygraph.Interaction.endPan = Dygraph.Interaction.maybeTreatMouseOpAsClick;
+DygraphInteraction.endPan = DygraphInteraction.maybeTreatMouseOpAsClick;
/**
* Called in response to an interaction model operation that
* dragStartX/dragStartY/etc. properties). This function modifies the
* context.
*/
-Dygraph.Interaction.startZoom = function(event, g, context) {
+DygraphInteraction.startZoom = function(event, g, context) {
context.isZooming = true;
context.zoomMoved = false;
};
* dragStartX/dragStartY/etc. properties). This function modifies the
* context.
*/
-Dygraph.Interaction.moveZoom = function(event, g, context) {
+DygraphInteraction.moveZoom = function(event, g, context) {
context.zoomMoved = true;
- context.dragEndX = Dygraph.dragGetX_(event, context);
- context.dragEndY = Dygraph.dragGetY_(event, context);
+ context.dragEndX = utils.dragGetX_(event, context);
+ context.dragEndY = utils.dragGetY_(event, context);
var xDelta = Math.abs(context.dragStartX - context.dragEndX);
var yDelta = Math.abs(context.dragStartY - context.dragEndY);
// drag direction threshold for y axis is twice as large as x axis
- context.dragDirection = (xDelta < yDelta / 2) ? Dygraph.VERTICAL : Dygraph.HORIZONTAL;
+ context.dragDirection = (xDelta < yDelta / 2) ? utils.VERTICAL : utils.HORIZONTAL;
g.drawZoomRect_(
context.dragDirection,
* @param {Event} event
* @param {Object} context
*/
-Dygraph.Interaction.treatMouseOpAsClick = function(g, event, context) {
+DygraphInteraction.treatMouseOpAsClick = function(g, event, context) {
var clickCallback = g.getFunctionOption('clickCallback');
var pointClickCallback = g.getFunctionOption('pointClickCallback');
* dragStartX/dragStartY/etc. properties). This function modifies the
* context.
*/
-Dygraph.Interaction.endZoom = function(event, g, context) {
+DygraphInteraction.endZoom = function(event, g, context) {
g.clearZoomRect_();
context.isZooming = false;
- Dygraph.Interaction.maybeTreatMouseOpAsClick(event, g, context);
+ DygraphInteraction.maybeTreatMouseOpAsClick(event, g, context);
// The zoom rectangle is visibly clipped to the plot area, so its behavior
// should be as well.
// See http://code.google.com/p/dygraphs/issues/detail?id=280
var plotArea = g.getArea();
if (context.regionWidth >= 10 &&
- context.dragDirection == Dygraph.HORIZONTAL) {
+ context.dragDirection == utils.HORIZONTAL) {
var left = Math.min(context.dragStartX, context.dragEndX),
right = Math.max(context.dragStartX, context.dragEndX);
left = Math.max(left, plotArea.x);
}
context.cancelNextDblclick = true;
} else if (context.regionHeight >= 10 &&
- context.dragDirection == Dygraph.VERTICAL) {
+ context.dragDirection == utils.VERTICAL) {
var top = Math.min(context.dragStartY, context.dragEndY),
bottom = Math.max(context.dragStartY, context.dragEndY);
top = Math.max(top, plotArea.y);
/**
* @private
*/
-Dygraph.Interaction.startTouch = function(event, g, context) {
+DygraphInteraction.startTouch = function(event, g, context) {
event.preventDefault(); // touch browsers are all nice.
if (event.touches.length > 1) {
// If the user ever puts two fingers down, it's not a double tap.
/**
* @private
*/
-Dygraph.Interaction.moveTouch = function(event, g, context) {
+DygraphInteraction.moveTouch = function(event, g, context) {
// If the tap moves, then it's definitely not part of a double-tap.
context.startTimeForDoubleTapMs = null;
/**
* @private
*/
-Dygraph.Interaction.endTouch = function(event, g, context) {
+DygraphInteraction.endTouch = function(event, g, context) {
if (event.touches.length !== 0) {
// this is effectively a "reset"
- Dygraph.Interaction.startTouch(event, g, context);
+ DygraphInteraction.startTouch(event, g, context);
} else if (event.changedTouches.length == 1) {
// Could be part of a "double tap"
// The heuristic here is that it's a double-tap if the two touchend events
* edge of the chart. For events in the interior of the chart, this returns zero.
*/
var distanceFromChart = function(event, g) {
- var chartPos = Dygraph.findPos(g.canvas_);
+ var chartPos = utils.findPos(g.canvas_);
var box = {
left: chartPos.x,
right: chartPos.x + g.canvas_.offsetWidth,
};
var pt = {
- x: Dygraph.pageX(event),
- y: Dygraph.pageY(event)
+ x: utils.pageX(event),
+ y: utils.pageY(event)
};
var dx = distanceFromInterval(pt.x, box.left, box.right),
* this when constructing your own interaction model, e.g.:
* g.updateOptions( {
* interactionModel: {
- * mousedown: Dygraph.defaultInteractionModel.mousedown
+ * mousedown: DygraphInteraction.defaultInteractionModel.mousedown
* }
* } );
*/
-Dygraph.Interaction.defaultModel = {
+DygraphInteraction.defaultModel = {
// Track the beginning of drag events
mousedown: function(event, g, context) {
// Right-click should not initiate a zoom.
context.initializeMouseDown(event, g, context);
if (event.altKey || event.shiftKey) {
- Dygraph.startPan(event, g, context);
+ DygraphInteraction.startPan(event, g, context);
} else {
- Dygraph.startZoom(event, g, context);
+ DygraphInteraction.startZoom(event, g, context);
}
// Note: we register mousemove/mouseup on document to allow some leeway for
// When the mouse moves >200px from the chart edge, cancel the zoom.
var d = distanceFromChart(event, g);
if (d < DRAG_EDGE_MARGIN) {
- Dygraph.moveZoom(event, g, context);
+ DygraphInteraction.moveZoom(event, g, context);
} else {
if (context.dragEndX !== null) {
context.dragEndX = null;
}
}
} else if (context.isPanning) {
- Dygraph.movePan(event, g, context);
+ DygraphInteraction.movePan(event, g, context);
}
};
var mouseup = function(event) {
if (context.isZooming) {
if (context.dragEndX !== null) {
- Dygraph.endZoom(event, g, context);
+ DygraphInteraction.endZoom(event, g, context);
} else {
- Dygraph.Interaction.maybeTreatMouseOpAsClick(event, g, context);
+ DygraphInteraction.maybeTreatMouseOpAsClick(event, g, context);
}
} else if (context.isPanning) {
- Dygraph.endPan(event, g, context);
+ DygraphInteraction.endPan(event, g, context);
}
- Dygraph.removeEvent(document, 'mousemove', mousemove);
- Dygraph.removeEvent(document, 'mouseup', mouseup);
+ utils.removeEvent(document, 'mousemove', mousemove);
+ utils.removeEvent(document, 'mouseup', mouseup);
context.destroy();
};
willDestroyContextMyself: true,
touchstart: function(event, g, context) {
- Dygraph.Interaction.startTouch(event, g, context);
+ DygraphInteraction.startTouch(event, g, context);
},
touchmove: function(event, g, context) {
- Dygraph.Interaction.moveTouch(event, g, context);
+ DygraphInteraction.moveTouch(event, g, context);
},
touchend: function(event, g, context) {
- Dygraph.Interaction.endTouch(event, g, context);
+ DygraphInteraction.endTouch(event, g, context);
},
// Disable zooming out if panning.
}
};
-Dygraph.DEFAULT_ATTRS.interactionModel = Dygraph.Interaction.defaultModel;
+/*
+Dygraph.DEFAULT_ATTRS.interactionModel = DygraphInteraction.defaultModel;
// old ways of accessing these methods/properties
-Dygraph.defaultInteractionModel = Dygraph.Interaction.defaultModel;
-Dygraph.endZoom = Dygraph.Interaction.endZoom;
-Dygraph.moveZoom = Dygraph.Interaction.moveZoom;
-Dygraph.startZoom = Dygraph.Interaction.startZoom;
-Dygraph.endPan = Dygraph.Interaction.endPan;
-Dygraph.movePan = Dygraph.Interaction.movePan;
-Dygraph.startPan = Dygraph.Interaction.startPan;
-
-Dygraph.Interaction.nonInteractiveModel_ = {
+Dygraph.defaultInteractionModel = DygraphInteraction.defaultModel;
+Dygraph.endZoom = DygraphInteraction.endZoom;
+Dygraph.moveZoom = DygraphInteraction.moveZoom;
+Dygraph.startZoom = DygraphInteraction.startZoom;
+Dygraph.endPan = DygraphInteraction.endPan;
+Dygraph.movePan = DygraphInteraction.movePan;
+Dygraph.startPan = DygraphInteraction.startPan;
+*/
+
+DygraphInteraction.nonInteractiveModel_ = {
mousedown: function(event, g, context) {
context.initializeMouseDown(event, g, context);
},
- mouseup: Dygraph.Interaction.maybeTreatMouseOpAsClick
+ mouseup: DygraphInteraction.maybeTreatMouseOpAsClick
};
// Default interaction model when using the range selector.
-Dygraph.Interaction.dragIsPanInteractionModel = {
+DygraphInteraction.dragIsPanInteractionModel = {
mousedown: function(event, g, context) {
context.initializeMouseDown(event, g, context);
- Dygraph.startPan(event, g, context);
+ DygraphInteraction.startPan(event, g, context);
},
mousemove: function(event, g, context) {
if (context.isPanning) {
- Dygraph.movePan(event, g, context);
+ DygraphInteraction.movePan(event, g, context);
}
},
mouseup: function(event, g, context) {
if (context.isPanning) {
- Dygraph.endPan(event, g, context);
+ DygraphInteraction.endPan(event, g, context);
}
}
};
-})();
+export default DygraphInteraction;
* dygraphs.
*/
-var DygraphLayout = (function() {
-
/*global Dygraph:false */
"use strict";
+import * as utils from './dygraph-utils';
+
/**
* Creates a new DygraphLayout object.
*
"annotation.icon property");
return;
}
- Dygraph.update(a, ann[i]);
+ utils.update(a, ann[i]);
if (!a.xval) a.xval = parse(a.x);
this.annotations.push(a);
}
this._xAxis.scale = (xrange !== 0 ? 1 / xrange : 1.0);
if (this.dygraph_.getOptionForAxis("logscale", 'x')) {
- this._xAxis.xlogrange = Dygraph.log10(this._xAxis.maxval) - Dygraph.log10(this._xAxis.minval);
+ this._xAxis.xlogrange = utils.log10(this._xAxis.maxval) - utils.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++) {
axis.yscale = (axis.yrange !== 0 ? 1.0 / axis.yrange : 1.0);
if (this.dygraph_.getOption("logscale")) {
- axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval);
+ axis.ylogrange = utils.log10(axis.maxyval) - utils.log10(axis.minyval);
axis.ylogscale = (axis.ylogrange !== 0 ? 1.0 / axis.ylogrange : 1.0);
if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) {
console.error('axis ' + i + ' of graph at ' + axis.g +
DygraphLayout.calcXNormal_ = function(value, xAxis, logscale) {
if (logscale) {
- return ((Dygraph.log10(value) - Dygraph.log10(xAxis.minval)) * xAxis.xlogscale);
+ return ((utils.log10(value) - utils.log10(xAxis.minval)) * xAxis.xlogscale);
} else {
return (value - xAxis.minval) * xAxis.scale;
}
*/
DygraphLayout.calcYNormal_ = function(axis, value, logscale) {
if (logscale) {
- var x = 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
+ var x = 1.0 - ((utils.log10(value) - utils.log10(axis.minyval)) * axis.ylogscale);
return isFinite(x) ? x : NaN; // shim for v8 issue; see pull request 276
} else {
return 1.0 - ((value - axis.minyval) * axis.yscale);
this.setPointsOffsets = [];
};
-return DygraphLayout;
-
-})();
+export default DygraphLayout;
* MIT-licensed (http://opensource.org/licenses/MIT)
*/
+"use strict";
+
+var OPTIONS_REFERENCE = null;
+
+// For "production" code, this gets removed by uglifyjs.
+if (process.env.NODE_ENV != 'production') {
+
// NOTE: in addition to parsing as JS, this snippet is expected to be valid
// JSON. This assumption cannot be checked in JS, but it will be checked when
// documentation is generated by the generate-documentation.py script. For the
// most part, this just means that you should always use double quotes.
-Dygraph.OPTIONS_REFERENCE = // <JSON>
+OPTIONS_REFERENCE = // <JSON>
{
"xValueParser": {
"default": "parseFloat() or Date.parse()*",
// most part, this just means that you should always use double quotes.
// Do a quick sanity check on the options reference.
-(function() {
- "use strict";
- var warn = function(msg) { if (window.console) window.console.warn(msg); };
- var flds = ['type', 'default', 'description'];
- var valid_cats = [
- 'Annotations',
- 'Axis display',
- 'Chart labels',
- 'CSV parsing',
- 'Callbacks',
- 'Data',
- 'Data Line display',
- 'Data Series Colors',
- 'Error Bars',
- 'Grid',
- 'Interactive Elements',
- 'Range Selector',
- 'Legend',
- 'Overall display',
- 'Rolling Averages',
- 'Series',
- 'Value display/formatting',
- 'Zooming',
- 'Debugging',
- 'Configuration',
- 'Deprecated'
- ];
- var i;
- var cats = {};
- for (i = 0; i < valid_cats.length; i++) cats[valid_cats[i]] = true;
+var warn = function(msg) { if (window.console) window.console.warn(msg); };
+var flds = ['type', 'default', 'description'];
+var valid_cats = [
+ 'Annotations',
+ 'Axis display',
+ 'Chart labels',
+ 'CSV parsing',
+ 'Callbacks',
+ 'Data',
+ 'Data Line display',
+ 'Data Series Colors',
+ 'Error Bars',
+ 'Grid',
+ 'Interactive Elements',
+ 'Range Selector',
+ 'Legend',
+ 'Overall display',
+ 'Rolling Averages',
+ 'Series',
+ 'Value display/formatting',
+ 'Zooming',
+ 'Debugging',
+ 'Configuration',
+ 'Deprecated'
+];
+var i;
+var cats = {};
+for (i = 0; i < valid_cats.length; i++) cats[valid_cats[i]] = true;
- for (var k in Dygraph.OPTIONS_REFERENCE) {
- if (!Dygraph.OPTIONS_REFERENCE.hasOwnProperty(k)) continue;
- var op = Dygraph.OPTIONS_REFERENCE[k];
- for (i = 0; i < flds.length; i++) {
- if (!op.hasOwnProperty(flds[i])) {
- warn('Option ' + k + ' missing "' + flds[i] + '" property');
- } else if (typeof(op[flds[i]]) != 'string') {
- warn(k + '.' + flds[i] + ' must be of type string');
- }
+for (var k in OPTIONS_REFERENCE) {
+ if (!OPTIONS_REFERENCE.hasOwnProperty(k)) continue;
+ var op = OPTIONS_REFERENCE[k];
+ for (i = 0; i < flds.length; i++) {
+ if (!op.hasOwnProperty(flds[i])) {
+ warn('Option ' + k + ' missing "' + flds[i] + '" property');
+ } else if (typeof(op[flds[i]]) != 'string') {
+ warn(k + '.' + flds[i] + ' must be of type string');
}
- var labels = op.labels;
- if (typeof(labels) !== 'object') {
- warn('Option "' + k + '" is missing a "labels": [...] option');
- } else {
- for (i = 0; i < labels.length; i++) {
- if (!cats.hasOwnProperty(labels[i])) {
- warn('Option "' + k + '" has label "' + labels[i] +
- '", which is invalid.');
- }
+ }
+ var labels = op.labels;
+ if (typeof(labels) !== 'object') {
+ warn('Option "' + k + '" is missing a "labels": [...] option');
+ } else {
+ for (i = 0; i < labels.length; i++) {
+ if (!cats.hasOwnProperty(labels[i])) {
+ warn('Option "' + k + '" has label "' + labels[i] +
+ '", which is invalid.');
}
}
}
-})();
+}
+
+}
+
+export default OPTIONS_REFERENCE;
*/
/**
- * @fileoverview DygraphOptions is responsible for parsing and returning information about options.
- *
- * Still tightly coupled to Dygraphs, we could remove some of that, you know.
+ * @fileoverview DygraphOptions is responsible for parsing and returning
+ * information about options.
*/
-var DygraphOptions = (function() {
-/*jshint strict:false */
-
-// For "production" code, this gets set to false by uglifyjs.
-// Need to define it outside of "use strict", hence the nested IIFEs.
-if (typeof(DEBUG) === 'undefined') DEBUG=true;
-
-return (function() {
-
// TODO: remove this jshint directive & fix the warnings.
/*jshint sub:true */
-/*global Dygraph:false */
"use strict";
+import * as utils from './dygraph-utils';
+import DEFAULT_ATTRS from './dygraph-default-attrs';
+import OPTIONS_REFERENCE from './dygraph-options-reference';
+
/*
* Interesting member variables: (REMOVING THIS LIST AS I CLOSURIZE)
* global_ - global attributes (common among all graphs, AIUI)
}
var axis_opts = this.user_["axes"] || {};
- Dygraph.update(this.yAxes_[0].options, axis_opts["y"] || {});
+ utils.update(this.yAxes_[0].options, axis_opts["y"] || {});
if (this.yAxes_.length > 1) {
- Dygraph.update(this.yAxes_[1].options, axis_opts["y2"] || {});
+ utils.update(this.yAxes_[1].options, axis_opts["y2"] || {});
}
- Dygraph.update(this.xAxis_.options, axis_opts["x"] || {});
+ utils.update(this.xAxis_.options, axis_opts["x"] || {});
- if (DEBUG) this.validateOptions_();
+ // For "production" code, this gets removed by uglifyjs.
+ if (process.env.NODE_ENV != 'production') {
+ this.validateOptions_();
+ }
};
/**
if (this.global_.hasOwnProperty(name)) {
return this.global_[name];
}
- if (Dygraph.DEFAULT_ATTRS.hasOwnProperty(name)) {
- return Dygraph.DEFAULT_ATTRS[name];
+ if (DEFAULT_ATTRS.hasOwnProperty(name)) {
+ return DEFAULT_ATTRS[name];
}
return null;
};
}
}
// Default axis options third.
- var defaultAxisOptions = Dygraph.DEFAULT_ATTRS.axes[axisString];
+ var defaultAxisOptions = DEFAULT_ATTRS.axes[axisString];
if (defaultAxisOptions.hasOwnProperty(name)) {
return defaultAxisOptions[name];
}
return this.labels_;
};
-if (DEBUG) {
+// For "production" code, this gets removed by uglifyjs.
+if (process.env.NODE_ENV != 'production') {
/**
* Validate all options.
- * This requires Dygraph.OPTIONS_REFERENCE, which is only available in debug builds.
+ * This requires OPTIONS_REFERENCE, which is only available in debug builds.
* @private
*/
DygraphOptions.prototype.validateOptions_ = function() {
- if (typeof Dygraph.OPTIONS_REFERENCE === 'undefined') {
+ if (typeof OPTIONS_REFERENCE === 'undefined') {
throw 'Called validateOptions_ in prod build.';
}
var that = this;
var validateOption = function(optionName) {
- if (!Dygraph.OPTIONS_REFERENCE[optionName]) {
+ if (!OPTIONS_REFERENCE[optionName]) {
that.warnInvalidOption_(optionName);
}
};
}
-return DygraphOptions;
-
-})();
-})();
+export default DygraphOptions;
+++ /dev/null
-/*global Dygraph:false */
-
-// Namespace for plugins. Load this before plugins/*.js files.
-Dygraph.Plugins = {};
/*jshint sub:true */
/*global Dygraph:false */
-(function() {
"use strict";
+import * as utils from './dygraph-utils';
+
/** @typedef {Array.<{v:number, label:string, label_v:(string|undefined)}>} */
-Dygraph.TickList = undefined; // the ' = undefined' keeps jshint happy.
+var TickList = undefined; // the ' = undefined' keeps jshint happy.
/** @typedef {function(
* number,
* function(string):*,
* Dygraph=,
* Array.<number>=
- * ): Dygraph.TickList}
+ * ): TickList}
*/
-Dygraph.Ticker = undefined; // the ' = undefined' keeps jshint happy.
+var Ticker = undefined; // the ' = undefined' keeps jshint happy.
-/** @type {Dygraph.Ticker} */
-Dygraph.numericLinearTicks = function(a, b, pixels, opts, dygraph, vals) {
+/** @type {Ticker} */
+export var numericLinearTicks = function(a, b, pixels, opts, dygraph, vals) {
var nonLogscaleOpts = function(opt) {
if (opt === 'logscale') return false;
return opts(opt);
};
- return Dygraph.numericTicks(a, b, pixels, nonLogscaleOpts, dygraph, vals);
+ return numericTicks(a, b, pixels, nonLogscaleOpts, dygraph, vals);
};
-/** @type {Dygraph.Ticker} */
-Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
+/** @type {Ticker} */
+export var numericTicks = function(a, b, pixels, opts, dygraph, vals) {
var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel'));
var ticks = [];
var i, j, tickV, nTicks;
// TODO(danvk): factor this log-scale block out into a separate function.
if (opts("logscale")) {
nTicks = Math.floor(pixels / pixels_per_tick);
- var minIdx = Dygraph.binarySearch(a, Dygraph.PREFERRED_LOG_TICK_VALUES, 1);
- var maxIdx = Dygraph.binarySearch(b, Dygraph.PREFERRED_LOG_TICK_VALUES, -1);
+ var minIdx = utils.binarySearch(a, PREFERRED_LOG_TICK_VALUES, 1);
+ var maxIdx = utils.binarySearch(b, PREFERRED_LOG_TICK_VALUES, -1);
if (minIdx == -1) {
minIdx = 0;
}
if (maxIdx == -1) {
- maxIdx = Dygraph.PREFERRED_LOG_TICK_VALUES.length - 1;
+ maxIdx = PREFERRED_LOG_TICK_VALUES.length - 1;
}
// Count the number of tick values would appear, if we can get at least
// nTicks / 4 accept them.
var lastDisplayed = null;
if (maxIdx - minIdx >= nTicks / 4) {
for (var idx = maxIdx; idx >= minIdx; idx--) {
- var tickValue = Dygraph.PREFERRED_LOG_TICK_VALUES[idx];
+ var tickValue = PREFERRED_LOG_TICK_VALUES[idx];
var pixel_coord = Math.log(tickValue / a) / Math.log(b / a) * pixels;
var tick = { v: tickValue };
if (lastDisplayed === null) {
};
-/** @type {Dygraph.Ticker} */
-Dygraph.dateTicker = function(a, b, pixels, opts, dygraph, vals) {
- var chosen = Dygraph.pickDateTickGranularity(a, b, pixels, opts);
+/** @type {Ticker} */
+export var dateTicker = function(a, b, pixels, opts, dygraph, vals) {
+ var chosen = pickDateTickGranularity(a, b, pixels, opts);
if (chosen >= 0) {
- return Dygraph.getDateAxis(a, b, chosen, opts, dygraph);
+ return getDateAxis(a, b, chosen, opts, dygraph);
} else {
// this can happen if self.width_ is zero.
return [];
};
// Time granularity enumeration
-// TODO(danvk): make this an @enum
-Dygraph.SECONDLY = 0;
-Dygraph.TWO_SECONDLY = 1;
-Dygraph.FIVE_SECONDLY = 2;
-Dygraph.TEN_SECONDLY = 3;
-Dygraph.THIRTY_SECONDLY = 4;
-Dygraph.MINUTELY = 5;
-Dygraph.TWO_MINUTELY = 6;
-Dygraph.FIVE_MINUTELY = 7;
-Dygraph.TEN_MINUTELY = 8;
-Dygraph.THIRTY_MINUTELY = 9;
-Dygraph.HOURLY = 10;
-Dygraph.TWO_HOURLY = 11;
-Dygraph.SIX_HOURLY = 12;
-Dygraph.DAILY = 13;
-Dygraph.TWO_DAILY = 14;
-Dygraph.WEEKLY = 15;
-Dygraph.MONTHLY = 16;
-Dygraph.QUARTERLY = 17;
-Dygraph.BIANNUAL = 18;
-Dygraph.ANNUAL = 19;
-Dygraph.DECADAL = 20;
-Dygraph.CENTENNIAL = 21;
-Dygraph.NUM_GRANULARITIES = 22;
+export var Granularity = {
+ SECONDLY: 0,
+ TWO_SECONDLY: 1,
+ FIVE_SECONDLY: 2,
+ TEN_SECONDLY: 3,
+ THIRTY_SECONDLY : 4,
+ MINUTELY: 5,
+ TWO_MINUTELY: 6,
+ FIVE_MINUTELY: 7,
+ TEN_MINUTELY: 8,
+ THIRTY_MINUTELY: 9,
+ HOURLY: 10,
+ TWO_HOURLY: 11,
+ SIX_HOURLY: 12,
+ DAILY: 13,
+ TWO_DAILY: 14,
+ WEEKLY: 15,
+ MONTHLY: 16,
+ QUARTERLY: 17,
+ BIANNUAL: 18,
+ ANNUAL: 19,
+ DECADAL: 20,
+ CENTENNIAL: 21,
+ NUM_GRANULARITIES: 22
+}
// Date components enumeration (in the order of the arguments in Date)
// TODO: make this an @enum
-Dygraph.DATEFIELD_Y = 0;
-Dygraph.DATEFIELD_M = 1;
-Dygraph.DATEFIELD_D = 2;
-Dygraph.DATEFIELD_HH = 3;
-Dygraph.DATEFIELD_MM = 4;
-Dygraph.DATEFIELD_SS = 5;
-Dygraph.DATEFIELD_MS = 6;
-Dygraph.NUM_DATEFIELDS = 7;
+var DateField = {
+ DATEFIELD_Y: 0,
+ DATEFIELD_M: 1,
+ DATEFIELD_D: 2,
+ DATEFIELD_HH: 3,
+ DATEFIELD_MM: 4,
+ DATEFIELD_SS: 5,
+ DATEFIELD_MS: 6,
+ NUM_DATEFIELDS: 7
+};
/**
*
* @type {Array.<{datefield:number, step:number, spacing:number}>}
*/
-Dygraph.TICK_PLACEMENT = [];
-Dygraph.TICK_PLACEMENT[Dygraph.SECONDLY] = {datefield: Dygraph.DATEFIELD_SS, step: 1, spacing: 1000 * 1};
-Dygraph.TICK_PLACEMENT[Dygraph.TWO_SECONDLY] = {datefield: Dygraph.DATEFIELD_SS, step: 2, spacing: 1000 * 2};
-Dygraph.TICK_PLACEMENT[Dygraph.FIVE_SECONDLY] = {datefield: Dygraph.DATEFIELD_SS, step: 5, spacing: 1000 * 5};
-Dygraph.TICK_PLACEMENT[Dygraph.TEN_SECONDLY] = {datefield: Dygraph.DATEFIELD_SS, step: 10, spacing: 1000 * 10};
-Dygraph.TICK_PLACEMENT[Dygraph.THIRTY_SECONDLY] = {datefield: Dygraph.DATEFIELD_SS, step: 30, spacing: 1000 * 30};
-Dygraph.TICK_PLACEMENT[Dygraph.MINUTELY] = {datefield: Dygraph.DATEFIELD_MM, step: 1, spacing: 1000 * 60};
-Dygraph.TICK_PLACEMENT[Dygraph.TWO_MINUTELY] = {datefield: Dygraph.DATEFIELD_MM, step: 2, spacing: 1000 * 60 * 2};
-Dygraph.TICK_PLACEMENT[Dygraph.FIVE_MINUTELY] = {datefield: Dygraph.DATEFIELD_MM, step: 5, spacing: 1000 * 60 * 5};
-Dygraph.TICK_PLACEMENT[Dygraph.TEN_MINUTELY] = {datefield: Dygraph.DATEFIELD_MM, step: 10, spacing: 1000 * 60 * 10};
-Dygraph.TICK_PLACEMENT[Dygraph.THIRTY_MINUTELY] = {datefield: Dygraph.DATEFIELD_MM, step: 30, spacing: 1000 * 60 * 30};
-Dygraph.TICK_PLACEMENT[Dygraph.HOURLY] = {datefield: Dygraph.DATEFIELD_HH, step: 1, spacing: 1000 * 3600};
-Dygraph.TICK_PLACEMENT[Dygraph.TWO_HOURLY] = {datefield: Dygraph.DATEFIELD_HH, step: 2, spacing: 1000 * 3600 * 2};
-Dygraph.TICK_PLACEMENT[Dygraph.SIX_HOURLY] = {datefield: Dygraph.DATEFIELD_HH, step: 6, spacing: 1000 * 3600 * 6};
-Dygraph.TICK_PLACEMENT[Dygraph.DAILY] = {datefield: Dygraph.DATEFIELD_D, step: 1, spacing: 1000 * 86400};
-Dygraph.TICK_PLACEMENT[Dygraph.TWO_DAILY] = {datefield: Dygraph.DATEFIELD_D, step: 2, spacing: 1000 * 86400 * 2};
-Dygraph.TICK_PLACEMENT[Dygraph.WEEKLY] = {datefield: Dygraph.DATEFIELD_D, step: 7, spacing: 1000 * 604800};
-Dygraph.TICK_PLACEMENT[Dygraph.MONTHLY] = {datefield: Dygraph.DATEFIELD_M, step: 1, spacing: 1000 * 7200 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 12
-Dygraph.TICK_PLACEMENT[Dygraph.QUARTERLY] = {datefield: Dygraph.DATEFIELD_M, step: 3, spacing: 1000 * 21600 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 4
-Dygraph.TICK_PLACEMENT[Dygraph.BIANNUAL] = {datefield: Dygraph.DATEFIELD_M, step: 6, spacing: 1000 * 43200 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 2
-Dygraph.TICK_PLACEMENT[Dygraph.ANNUAL] = {datefield: Dygraph.DATEFIELD_Y, step: 1, spacing: 1000 * 86400 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 1
-Dygraph.TICK_PLACEMENT[Dygraph.DECADAL] = {datefield: Dygraph.DATEFIELD_Y, step: 10, spacing: 1000 * 864000 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 10
-Dygraph.TICK_PLACEMENT[Dygraph.CENTENNIAL] = {datefield: Dygraph.DATEFIELD_Y, step: 100, spacing: 1000 * 8640000 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 100
+var TICK_PLACEMENT = [];
+TICK_PLACEMENT[Granularity.SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 1, spacing: 1000 * 1};
+TICK_PLACEMENT[Granularity.TWO_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 2, spacing: 1000 * 2};
+TICK_PLACEMENT[Granularity.FIVE_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 5, spacing: 1000 * 5};
+TICK_PLACEMENT[Granularity.TEN_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 10, spacing: 1000 * 10};
+TICK_PLACEMENT[Granularity.THIRTY_SECONDLY] = {datefield: DateField.DATEFIELD_SS, step: 30, spacing: 1000 * 30};
+TICK_PLACEMENT[Granularity.MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 1, spacing: 1000 * 60};
+TICK_PLACEMENT[Granularity.TWO_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 2, spacing: 1000 * 60 * 2};
+TICK_PLACEMENT[Granularity.FIVE_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 5, spacing: 1000 * 60 * 5};
+TICK_PLACEMENT[Granularity.TEN_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 10, spacing: 1000 * 60 * 10};
+TICK_PLACEMENT[Granularity.THIRTY_MINUTELY] = {datefield: DateField.DATEFIELD_MM, step: 30, spacing: 1000 * 60 * 30};
+TICK_PLACEMENT[Granularity.HOURLY] = {datefield: DateField.DATEFIELD_HH, step: 1, spacing: 1000 * 3600};
+TICK_PLACEMENT[Granularity.TWO_HOURLY] = {datefield: DateField.DATEFIELD_HH, step: 2, spacing: 1000 * 3600 * 2};
+TICK_PLACEMENT[Granularity.SIX_HOURLY] = {datefield: DateField.DATEFIELD_HH, step: 6, spacing: 1000 * 3600 * 6};
+TICK_PLACEMENT[Granularity.DAILY] = {datefield: DateField.DATEFIELD_D, step: 1, spacing: 1000 * 86400};
+TICK_PLACEMENT[Granularity.TWO_DAILY] = {datefield: DateField.DATEFIELD_D, step: 2, spacing: 1000 * 86400 * 2};
+TICK_PLACEMENT[Granularity.WEEKLY] = {datefield: DateField.DATEFIELD_D, step: 7, spacing: 1000 * 604800};
+TICK_PLACEMENT[Granularity.MONTHLY] = {datefield: DateField.DATEFIELD_M, step: 1, spacing: 1000 * 7200 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 12
+TICK_PLACEMENT[Granularity.QUARTERLY] = {datefield: DateField.DATEFIELD_M, step: 3, spacing: 1000 * 21600 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 4
+TICK_PLACEMENT[Granularity.BIANNUAL] = {datefield: DateField.DATEFIELD_M, step: 6, spacing: 1000 * 43200 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 / 2
+TICK_PLACEMENT[Granularity.ANNUAL] = {datefield: DateField.DATEFIELD_Y, step: 1, spacing: 1000 * 86400 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 1
+TICK_PLACEMENT[Granularity.DECADAL] = {datefield: DateField.DATEFIELD_Y, step: 10, spacing: 1000 * 864000 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 10
+TICK_PLACEMENT[Granularity.CENTENNIAL] = {datefield: DateField.DATEFIELD_Y, step: 100, spacing: 1000 * 8640000 * 365.2524}; // 1e3 * 60 * 60 * 24 * 365.2524 * 100
/**
* This is a list of human-friendly values at which to show tick marks on a log
* scale. It is k * 10^n, where k=1..9 and n=-39..+39, so:
* ..., 1, 2, 3, 4, 5, ..., 9, 10, 20, 30, ..., 90, 100, 200, 300, ...
- * NOTE: this assumes that Dygraph.LOG_SCALE = 10.
+ * NOTE: this assumes that utils.LOG_SCALE = 10.
* @type {Array.<number>}
*/
-Dygraph.PREFERRED_LOG_TICK_VALUES = (function() {
+var PREFERRED_LOG_TICK_VALUES = (function() {
var vals = [];
for (var power = -39; power <= 39; power++) {
var range = Math.pow(10, power);
* @return {number} The appropriate axis granularity for this chart. See the
* enumeration of possible values in dygraph-tickers.js.
*/
-Dygraph.pickDateTickGranularity = function(a, b, pixels, opts) {
+var pickDateTickGranularity = function(a, b, pixels, opts) {
var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel'));
- for (var i = 0; i < Dygraph.NUM_GRANULARITIES; i++) {
- var num_ticks = Dygraph.numDateTicks(a, b, i);
+ for (var i = 0; i < Granularity.NUM_GRANULARITIES; i++) {
+ var num_ticks = numDateTicks(a, b, i);
if (pixels / num_ticks >= pixels_per_tick) {
return i;
}
* @param {number} granularity (one of the granularities enumerated above)
* @return {number} (Approximate) number of ticks that would result.
*/
-Dygraph.numDateTicks = function(start_time, end_time, granularity) {
- var spacing = Dygraph.TICK_PLACEMENT[granularity].spacing;
+var numDateTicks = function(start_time, end_time, granularity) {
+ var spacing = TICK_PLACEMENT[granularity].spacing;
return Math.round(1.0 * (end_time - start_time) / spacing);
};
* @param {number} granularity (one of the granularities enumerated above)
* @param {function(string):*} opts Function mapping from option name -> value.
* @param {Dygraph=} dg
- * @return {!Dygraph.TickList}
+ * @return {!TickList}
*/
-Dygraph.getDateAxis = function(start_time, end_time, granularity, opts, dg) {
+export var getDateAxis = function(start_time, end_time, granularity, opts, dg) {
var formatter = /** @type{AxisLabelFormatter} */(
opts("axisLabelFormatter"));
var utc = opts("labelsUTC");
- var accessors = utc ? Dygraph.DateAccessorsUTC : Dygraph.DateAccessorsLocal;
+ var accessors = utc ? utils.DateAccessorsUTC : utils.DateAccessorsLocal;
- var datefield = Dygraph.TICK_PLACEMENT[granularity].datefield;
- var step = Dygraph.TICK_PLACEMENT[granularity].step;
- var spacing = Dygraph.TICK_PLACEMENT[granularity].spacing;
+ var datefield = TICK_PLACEMENT[granularity].datefield;
+ var step = TICK_PLACEMENT[granularity].step;
+ var spacing = TICK_PLACEMENT[granularity].spacing;
// Choose a nice tick position before the initial instant.
// Currently, this code deals properly with the existent daily granularities:
// by setting the start_date_offset to 0.
var start_date = new Date(start_time);
var date_array = [];
- date_array[Dygraph.DATEFIELD_Y] = accessors.getFullYear(start_date);
- date_array[Dygraph.DATEFIELD_M] = accessors.getMonth(start_date);
- date_array[Dygraph.DATEFIELD_D] = accessors.getDate(start_date);
- date_array[Dygraph.DATEFIELD_HH] = accessors.getHours(start_date);
- date_array[Dygraph.DATEFIELD_MM] = accessors.getMinutes(start_date);
- date_array[Dygraph.DATEFIELD_SS] = accessors.getSeconds(start_date);
- date_array[Dygraph.DATEFIELD_MS] = accessors.getMilliseconds(start_date);
+ date_array[DateField.DATEFIELD_Y] = accessors.getFullYear(start_date);
+ date_array[DateField.DATEFIELD_M] = accessors.getMonth(start_date);
+ date_array[DateField.DATEFIELD_D] = accessors.getDate(start_date);
+ date_array[DateField.DATEFIELD_HH] = accessors.getHours(start_date);
+ date_array[DateField.DATEFIELD_MM] = accessors.getMinutes(start_date);
+ date_array[DateField.DATEFIELD_SS] = accessors.getSeconds(start_date);
+ date_array[DateField.DATEFIELD_MS] = accessors.getMilliseconds(start_date);
var start_date_offset = date_array[datefield] % step;
- if (granularity == Dygraph.WEEKLY) {
+ if (granularity == Granularity.WEEKLY) {
// This will put the ticks on Sundays.
start_date_offset = accessors.getDay(start_date);
}
date_array[datefield] -= start_date_offset;
- for (var df = datefield + 1; df < Dygraph.NUM_DATEFIELDS; df++) {
+ for (var df = datefield + 1; df < DateField.NUM_DATEFIELDS; df++) {
// The minimum value is 1 for the day of month, and 0 for all other fields.
- date_array[df] = (df === Dygraph.DATEFIELD_D) ? 1 : 0;
+ date_array[df] = (df === DateField.DATEFIELD_D) ? 1 : 0;
}
// Generate the ticks.
var ticks = [];
var tick_date = accessors.makeDate.apply(null, date_array);
var tick_time = tick_date.getTime();
- if (granularity <= Dygraph.HOURLY) {
+ if (granularity <= Granularity.HOURLY) {
if (tick_time < start_time) {
tick_time += spacing;
tick_date = new Date(tick_time);
tick_time = tick_date.getTime();
}
while (tick_time <= end_time) {
- if (granularity >= Dygraph.DAILY ||
+ if (granularity >= Granularity.DAILY ||
accessors.getHours(tick_date) % step === 0) {
ticks.push({ v: tick_time,
label: formatter.call(dg, tick_date, granularity, opts, dg)
}
return ticks;
};
-
-// These are set here so that this file can be included after dygraph.js
-// or independently.
-if (Dygraph &&
- Dygraph.DEFAULT_ATTRS &&
- Dygraph.DEFAULT_ATTRS['axes'] &&
- Dygraph.DEFAULT_ATTRS['axes']['x'] &&
- Dygraph.DEFAULT_ATTRS['axes']['y'] &&
- Dygraph.DEFAULT_ATTRS['axes']['y2']) {
- Dygraph.DEFAULT_ATTRS['axes']['x']['ticker'] = Dygraph.dateTicker;
- Dygraph.DEFAULT_ATTRS['axes']['y']['ticker'] = Dygraph.numericTicks;
- Dygraph.DEFAULT_ATTRS['axes']['y2']['ticker'] = Dygraph.numericTicks;
-}
-
-})();
* search) and generic DOM-manipulation functions.
*/
-(function() {
-
/*global Dygraph:false, Node:false */
"use strict";
-Dygraph.LOG_SCALE = 10;
-Dygraph.LN_TEN = Math.log(Dygraph.LOG_SCALE);
+import * as DygraphTickers from './dygraph-tickers';
+
+export var LOG_SCALE = 10;
+export var LN_TEN = Math.log(LOG_SCALE);
/**
* @private
* @param {number} x
* @return {number}
*/
-Dygraph.log10 = function(x) {
- return Math.log(x) / Dygraph.LN_TEN;
+export var log10 = function(x) {
+ return Math.log(x) / LN_TEN;
};
/** A dotted line stroke pattern. */
-Dygraph.DOTTED_LINE = [2, 2];
+export var DOTTED_LINE = [2, 2];
/** A dashed line stroke pattern. */
-Dygraph.DASHED_LINE = [7, 3];
+export var DASHED_LINE = [7, 3];
/** A dot dash stroke pattern. */
-Dygraph.DOT_DASH_LINE = [7, 2, 2, 2];
+export var DOT_DASH_LINE = [7, 2, 2, 2];
+
+// Directions for panning and zooming. Use bit operations when combined
+// values are possible.
+export var HORIZONTAL = 1;
+export var VERTICAL = 2;
/**
* Return the 2d context for a dygraph canvas.
*
* This method is only exposed for the sake of replacing the function in
- * automated tests, e.g.
+ * automated tests.
*
- * var oldFunc = Dygraph.getContext();
- * Dygraph.getContext = function(canvas) {
- * var realContext = oldFunc(canvas);
- * return new Proxy(realContext);
- * };
* @param {!HTMLCanvasElement} canvas
* @return {!CanvasRenderingContext2D}
* @private
*/
-Dygraph.getContext = function(canvas) {
+export var getContext = function(canvas) {
return /** @type{!CanvasRenderingContext2D}*/(canvas.getContext("2d"));
};
* on the event. The function takes one parameter: the event object.
* @private
*/
-Dygraph.addEvent = function addEvent(elem, type, fn) {
+export var addEvent = function addEvent(elem, type, fn) {
elem.addEventListener(type, fn, false);
};
/**
- * Add an event handler. This event handler is kept until the graph is
- * destroyed with a call to graph.destroy().
- *
- * @param {!Node} elem The element to add the event to.
- * @param {string} type The type of the event, e.g. 'click' or 'mousemove'.
- * @param {function(Event):(boolean|undefined)} fn The function to call
- * on the event. The function takes one parameter: the event object.
- * @private
- */
-Dygraph.prototype.addAndTrackEvent = function(elem, type, fn) {
- Dygraph.addEvent(elem, type, fn);
- this.registeredEvents_.push({ elem : elem, type : type, fn : fn });
-};
-
-/**
* Remove an event handler.
* @param {!Node} elem The element to remove the event from.
* @param {string} type The type of the event, e.g. 'click' or 'mousemove'.
* @param {function(Event):(boolean|undefined)} fn The function to call
* on the event. The function takes one parameter: the event object.
- * @private
*/
-Dygraph.removeEvent = function(elem, type, fn) {
+export function removeEvent(elem, type, fn) {
elem.removeEventListener(type, fn, false);
};
-Dygraph.prototype.removeTrackedEvents_ = function() {
- if (this.registeredEvents_) {
- for (var idx = 0; idx < this.registeredEvents_.length; idx++) {
- var reg = this.registeredEvents_[idx];
- Dygraph.removeEvent(reg.elem, reg.type, reg.fn);
- }
- }
-
- this.registeredEvents_ = [];
-};
-
/**
* Cancels further processing of an event. This is useful to prevent default
* browser actions, e.g. highlighting text on a double-click.
* @param {!Event} e The event whose normal behavior should be canceled.
* @private
*/
-Dygraph.cancelEvent = function(e) {
+export function cancelEvent(e) {
e = e ? e : window.event;
if (e.stopPropagation) {
e.stopPropagation();
* @return { string } "rgb(r,g,b)" where r, g and b range from 0-255.
* @private
*/
-Dygraph.hsvToRGB = function (hue, saturation, value) {
+export function hsvToRGB(hue, saturation, value) {
var red;
var green;
var blue;
* @return {{x:number,y:number}}
* @private
*/
-Dygraph.findPos = function(obj) {
+export function findPos(obj) {
var p = obj.getBoundingClientRect(),
w = window,
d = document.documentElement;
* @return {number}
* @private
*/
-Dygraph.pageX = function(e) {
+export function pageX(e) {
return (!e.pageX || e.pageX < 0) ? 0 : e.pageX;
};
* @return {number}
* @private
*/
-Dygraph.pageY = function(e) {
+export function pageY(e) {
return (!e.pageY || e.pageY < 0) ? 0 : e.pageY;
};
* @param {!DygraphInteractionContext} context Interaction context object.
* @return {number} The amount by which the drag has moved to the right.
*/
-Dygraph.dragGetX_ = function(e, context) {
- return Dygraph.pageX(e) - context.px;
+export function dragGetX_(e, context) {
+ return pageX(e) - context.px;
};
/**
* @param {!DygraphInteractionContext} context Interaction context object.
* @return {number} The amount by which the drag has moved down.
*/
-Dygraph.dragGetY_ = function(e, context) {
- return Dygraph.pageY(e) - context.py;
+export function dragGetY_(e, context) {
+ return pageY(e) - context.py;
};
/**
* @return {boolean} Whether the number is zero or NaN.
* @private
*/
-Dygraph.isOK = function(x) {
+export function isOK(x) {
return !!x && !isNaN(x);
};
* @return {boolean} Whether the point has numeric x and y.
* @private
*/
-Dygraph.isValidPoint = function(p, opt_allowNaNY) {
+export function isValidPoint(p, opt_allowNaNY) {
if (!p) return false; // null or undefined object
if (p.yval === null) return false; // missing point
if (p.x === null || p.x === undefined) return false;
* @return {string} A string formatted like %g in printf. The max generated
* string length should be precision + 6 (e.g 1.123e+300).
*/
-Dygraph.floatFormat = function(x, opt_precision) {
+export function floatFormat(x, opt_precision) {
// Avoid invalid precision values; [1, 21] is the valid range.
var p = Math.min(Math.max(1, opt_precision || 2), 21);
* @return {string}
* @private
*/
-Dygraph.zeropad = function(x) {
+export function zeropad(x) {
if (x < 10) return "0" + x; else return "" + x;
};
* day, hour, minute, second and millisecond) according to local time,
* and factory method to call the Date constructor with an array of arguments.
*/
-Dygraph.DateAccessorsLocal = {
- getFullYear: function(d) {return d.getFullYear();},
- getMonth: function(d) {return d.getMonth();},
- getDate: function(d) {return d.getDate();},
- getHours: function(d) {return d.getHours();},
- getMinutes: function(d) {return d.getMinutes();},
- getSeconds: function(d) {return d.getSeconds();},
- getMilliseconds: function(d) {return d.getMilliseconds();},
- getDay: function(d) {return d.getDay();},
+export var DateAccessorsLocal = {
+ getFullYear: d => d.getFullYear(),
+ getMonth: d => d.getMonth(),
+ getDate: d => d.getDate(),
+ getHours: d => d.getHours(),
+ getMinutes: d => d.getMinutes(),
+ getSeconds: d => d.getSeconds(),
+ getMilliseconds: d => d.getMilliseconds(),
+ getDay: d => d.getDay(),
makeDate: function(y, m, d, hh, mm, ss, ms) {
return new Date(y, m, d, hh, mm, ss, ms);
}
* day of month, hour, minute, second and millisecond) according to UTC time,
* and factory method to call the Date constructor with an array of arguments.
*/
-Dygraph.DateAccessorsUTC = {
- getFullYear: function(d) {return d.getUTCFullYear();},
- getMonth: function(d) {return d.getUTCMonth();},
- getDate: function(d) {return d.getUTCDate();},
- getHours: function(d) {return d.getUTCHours();},
- getMinutes: function(d) {return d.getUTCMinutes();},
- getSeconds: function(d) {return d.getUTCSeconds();},
- getMilliseconds: function(d) {return d.getUTCMilliseconds();},
- getDay: function(d) {return d.getUTCDay();},
+export var DateAccessorsUTC = {
+ getFullYear: d => d.getUTCFullYear(),
+ getMonth: d => d.getUTCMonth(),
+ getDate: d => d.getUTCDate(),
+ getHours: d => d.getUTCHours(),
+ getMinutes: d => d.getUTCMinutes(),
+ getSeconds: d => d.getUTCSeconds(),
+ getMilliseconds: d => d.getUTCMilliseconds(),
+ getDay: d => d.getUTCDay(),
makeDate: function(y, m, d, hh, mm, ss, ms) {
return new Date(Date.UTC(y, m, d, hh, mm, ss, ms));
}
* @return {string} A time of the form "HH:MM" or "HH:MM:SS"
* @private
*/
-Dygraph.hmsString_ = function(hh, mm, ss) {
- var zeropad = Dygraph.zeropad;
+export function hmsString_(hh, mm, ss) {
var ret = zeropad(hh) + ":" + zeropad(mm);
if (ss) {
ret += ":" + zeropad(ss);
* "YYYY/MM/DD", "YYYY/MM/DD HH:MM" or "YYYY/MM/DD HH:MM:SS"
* @private
*/
-Dygraph.dateString_ = function(time, utc) {
- var zeropad = Dygraph.zeropad;
- var accessors = utc ? Dygraph.DateAccessorsUTC : Dygraph.DateAccessorsLocal;
+export function dateString_(time, utc) {
+ var accessors = utc ? DateAccessorsUTC : DateAccessorsLocal;
var date = new Date(time);
var y = accessors.getFullYear(date);
var m = accessors.getMonth(date);
var frac = hh * 3600 + mm * 60 + ss;
var ret = year + "/" + month + "/" + day;
if (frac) {
- ret += " " + Dygraph.hmsString_(hh, mm, ss);
+ ret += " " + hmsString_(hh, mm, ss);
}
return ret;
};
* @return {number} The rounded number
* @private
*/
-Dygraph.round_ = function(num, places) {
+export function round_(num, places) {
var shift = Math.pow(10, places);
return Math.round(num * shift)/shift;
};
* @return {number} Index of the element, or -1 if it isn't found.
* @private
*/
-Dygraph.binarySearch = function(val, arry, abs, low, high) {
+export function binarySearch(val, arry, abs, low, high) {
if (low === null || low === undefined ||
high === null || high === undefined) {
low = 0;
return mid;
}
}
- return Dygraph.binarySearch(val, arry, abs, low, mid - 1);
+ return binarySearch(val, arry, abs, low, mid - 1);
} else if (element < val) {
if (abs < 0) {
// Accept if element < val, but also if prior element > val.
return mid;
}
}
- return Dygraph.binarySearch(val, arry, abs, mid + 1, high);
+ return binarySearch(val, arry, abs, mid + 1, high);
}
return -1; // can't actually happen, but makes closure compiler happy
};
* @return {number} Milliseconds since epoch.
* @private
*/
-Dygraph.dateParser = function(dateStr) {
+export function dateParser(dateStr) {
var dateStrSlashed;
var d;
// Issue: http://code.google.com/p/dygraphs/issues/detail?id=255
if (dateStr.search("-") == -1 ||
dateStr.search("T") != -1 || dateStr.search("Z") != -1) {
- d = Dygraph.dateStrToMillis(dateStr);
+ d = dateStrToMillis(dateStr);
if (d && !isNaN(d)) return d;
}
while (dateStrSlashed.search("-") != -1) {
dateStrSlashed = dateStrSlashed.replace("-", "/");
}
- d = Dygraph.dateStrToMillis(dateStrSlashed);
+ d = dateStrToMillis(dateStrSlashed);
} else if (dateStr.length == 8) { // e.g. '20090712'
// TODO(danvk): remove support for this format. It's confusing.
dateStrSlashed = dateStr.substr(0,4) + "/" + dateStr.substr(4,2) + "/" +
dateStr.substr(6,2);
- d = Dygraph.dateStrToMillis(dateStrSlashed);
+ d = dateStrToMillis(dateStrSlashed);
} else {
// Any format that Date.parse will accept, e.g. "2009/07/12" or
// "2009/07/12 12:34:56"
- d = Dygraph.dateStrToMillis(dateStr);
+ d = dateStrToMillis(dateStr);
}
if (!d || isNaN(d)) {
* @return {number} millis since epoch
* @private
*/
-Dygraph.dateStrToMillis = function(str) {
+export function dateStrToMillis(str) {
return new Date(str).getTime();
};
* @param {!Object} o
* @return {!Object}
*/
-Dygraph.update = function(self, o) {
+export function update(self, o) {
if (typeof(o) != 'undefined' && o !== null) {
for (var k in o) {
if (o.hasOwnProperty(k)) {
* @return {!Object}
* @private
*/
-Dygraph.updateDeep = function (self, o) {
+export function updateDeep(self, o) {
// Taken from http://stackoverflow.com/questions/384286/javascript-isdom-how-do-you-check-if-a-javascript-object-is-a-dom-object
function isNode(o) {
return (
if (o.hasOwnProperty(k)) {
if (o[k] === null) {
self[k] = null;
- } else if (Dygraph.isArrayLike(o[k])) {
+ } else if (isArrayLike(o[k])) {
self[k] = o[k].slice();
} else if (isNode(o[k])) {
// DOM objects are shallowly-copied.
if (typeof(self[k]) != 'object' || self[k] === null) {
self[k] = {};
}
- Dygraph.updateDeep(self[k], o[k]);
+ updateDeep(self[k], o[k]);
} else {
self[k] = o[k];
}
* @return {boolean}
* @private
*/
-Dygraph.isArrayLike = function(o) {
+export function isArrayLike(o) {
var typ = typeof(o);
if (
(typ != 'object' && !(typ == 'function' &&
* @return {boolean}
* @private
*/
-Dygraph.isDateLike = function (o) {
+export function isDateLike(o) {
if (typeof(o) != "object" || o === null ||
typeof(o.getTime) != 'function') {
return false;
* @return {!Array}
* @private
*/
-Dygraph.clone = function(o) {
+export function clone(o) {
// TODO(danvk): figure out how MochiKit's version works
var r = [];
for (var i = 0; i < o.length; i++) {
- if (Dygraph.isArrayLike(o[i])) {
- r.push(Dygraph.clone(o[i]));
+ if (isArrayLike(o[i])) {
+ r.push(clone(o[i]));
} else {
r.push(o[i]);
}
* @return {!HTMLCanvasElement}
* @private
*/
-Dygraph.createCanvas = function() {
+export function createCanvas() {
return document.createElement('canvas');
};
* @return {number} The ratio of the device pixel ratio and the backing store
* ratio for the specified context.
*/
-Dygraph.getContextPixelRatio = function(context) {
+export function getContextPixelRatio(context) {
try {
var devicePixelRatio = window.devicePixelRatio;
var backingStoreRatio = context.webkitBackingStorePixelRatio ||
* @return {boolean}
* @private
*/
-Dygraph.isAndroid = function() {
+export function isAndroid() {
return (/Android/).test(navigator.userAgent);
};
* @param {function(!Array,?):boolean=} predicate
* @constructor
*/
-Dygraph.Iterator = function(array, start, length, predicate) {
+export function Iterator(array, start, length, predicate) {
start = start || 0;
length = length || array.length;
this.hasNext = true; // Use to identify if there's another element.
/**
* @return {Object}
*/
-Dygraph.Iterator.prototype.next = function() {
+Iterator.prototype.next = function() {
if (!this.hasNext) {
return null;
}
* returned. If omitted, all elements are accepted.
* @private
*/
-Dygraph.createIterator = function(array, start, length, opt_predicate) {
- return new Dygraph.Iterator(array, start, length, opt_predicate);
+export function createIterator(array, start, length, opt_predicate) {
+ return new Iterator(array, start, length, opt_predicate);
};
// Shim layer with setTimeout fallback.
// From: http://paulirish.com/2011/requestanimationframe-for-smart-animating/
// Should be called with the window context:
// Dygraph.requestAnimFrame.call(window, function() {})
-Dygraph.requestAnimFrame = (function() {
+export var requestAnimFrame = (function() {
return window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
window.mozRequestAnimationFrame ||
* @param {function()} cleanupFn A function to call after all repeatFn calls.
* @private
*/
-Dygraph.repeatAndCleanup = function(repeatFn, maxFrames, framePeriodInMillis,
+export function repeatAndCleanup(repeatFn, maxFrames, framePeriodInMillis,
cleanupFn) {
var frameNumber = 0;
var previousFrameNumber;
(function loop() {
if (frameNumber >= maxFrames) return;
- Dygraph.requestAnimFrame.call(window, function() {
+ requestAnimFrame.call(window, function() {
// Determine which frame to draw based on the delay so far. Will skip
// frames if necessary.
var currentTime = new Date().getTime();
* @return {boolean} true if the graph needs new points else false.
* @private
*/
-Dygraph.isPixelChangingOptionList = function(labels, attrs) {
+export function isPixelChangingOptionList(labels, attrs) {
// Assume that we do not require new points.
// This will change to true if we actually do need new points.
return false;
};
-Dygraph.Circles = {
+export var Circles = {
DEFAULT : function(g, name, ctx, canvasx, canvasy, color, radius) {
ctx.beginPath();
ctx.fillStyle = color;
*
* Usage:
* element.addEventListener('mousedown', function() {
- * var tarper = new Dygraph.IFrameTarp();
+ * var tarper = new utils.IFrameTarp();
* tarper.cover();
* var mouseUpHandler = function() {
* ...
*
* @constructor
*/
-Dygraph.IFrameTarp = function() {
+export function IFrameTarp() {
/** @type {Array.<!HTMLDivElement>} */
this.tarps = [];
};
* Find all the iframes in the document and cover them with high z-index
* transparent divs.
*/
-Dygraph.IFrameTarp.prototype.cover = function() {
+IFrameTarp.prototype.cover = function() {
var iframes = document.getElementsByTagName("iframe");
for (var i = 0; i < iframes.length; i++) {
var iframe = iframes[i];
/**
* Remove all the iframe covers. You should call this in a mouseup handler.
*/
-Dygraph.IFrameTarp.prototype.uncover = function() {
+IFrameTarp.prototype.uncover = function() {
for (var i = 0; i < this.tarps.length; i++) {
this.tarps[i].parentNode.removeChild(this.tarps[i]);
}
* @param {string} data
* @return {?string} the delimiter that was detected (or null on failure).
*/
-Dygraph.detectLineDelimiter = function(data) {
+export function detectLineDelimiter(data) {
for (var i = 0; i < data.length; i++) {
var code = data.charAt(i);
if (code === '\r') {
* @return {boolean} Whether containee is inside (or equal to) container.
* @private
*/
-Dygraph.isNodeContainedBy = function(containee, container) {
+export function isNodeContainedBy(containee, container) {
if (container === null || containee === null) {
return false;
}
// This masks some numeric issues in older versions of Firefox,
// where 1.0/Math.pow(10,2) != Math.pow(10,-2).
/** @type {function(number,number):number} */
-Dygraph.pow = function(base, exp) {
+export function pow(base, exp) {
if (exp < 0) {
return 1.0 / Math.pow(base, -exp);
}
* @return {{r:number,g:number,b:number,a:number?}} Parsed RGB tuple.
* @private
*/
-Dygraph.toRGB_ = function(colorStr) {
+export function toRGB_(colorStr) {
// Strategy: First try to parse colorStr directly. This is fast & avoids DOM
// manipulation. If that fails (e.g. for named colors like 'red'), then
// create a hidden DOM element and parse its computed color.
* optimization if you have one.
* @return {boolean} Whether the browser supports canvas.
*/
-Dygraph.isCanvasSupported = function(opt_canvasElement) {
+export function isCanvasSupported(opt_canvasElement) {
try {
var canvas = opt_canvasElement || document.createElement("canvas");
canvas.getContext("2d");
* @param {number=} opt_line_no The line number from which the string comes.
* @param {string=} opt_line The text of the line from which the string comes.
*/
-Dygraph.parseFloat_ = function(x, opt_line_no, opt_line) {
+export function parseFloat_(x, opt_line_no, opt_line) {
var val = parseFloat(x);
if (!isNaN(val)) return val;
return null;
};
-})();
+
+// Label constants for the labelsKMB and labelsKMG2 options.
+// (i.e. '100000' -> '100K')
+var KMB_LABELS = [ 'K', 'M', 'B', 'T', 'Q' ];
+var KMG2_BIG_LABELS = [ 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' ];
+var KMG2_SMALL_LABELS = [ 'm', 'u', 'n', 'p', 'f', 'a', 'z', 'y' ];
+
+/**
+ * @private
+ * Return a string version of a number. This respects the digitsAfterDecimal
+ * and maxNumberWidth options.
+ * @param {number} x The number to be formatted
+ * @param {Dygraph} opts An options view
+ */
+export function numberValueFormatter(x, opts) {
+ var sigFigs = opts('sigFigs');
+
+ if (sigFigs !== null) {
+ // User has opted for a fixed number of significant figures.
+ return floatFormat(x, sigFigs);
+ }
+
+ var digits = opts('digitsAfterDecimal');
+ var maxNumberWidth = opts('maxNumberWidth');
+
+ var kmb = opts('labelsKMB');
+ var kmg2 = opts('labelsKMG2');
+
+ var label;
+
+ // switch to scientific notation if we underflow or overflow fixed display.
+ if (x !== 0.0 &&
+ (Math.abs(x) >= Math.pow(10, maxNumberWidth) ||
+ Math.abs(x) < Math.pow(10, -digits))) {
+ label = x.toExponential(digits);
+ } else {
+ label = '' + round_(x, digits);
+ }
+
+ if (kmb || kmg2) {
+ var k;
+ var k_labels = [];
+ var m_labels = [];
+ if (kmb) {
+ k = 1000;
+ k_labels = KMB_LABELS;
+ }
+ if (kmg2) {
+ if (kmb) console.warn("Setting both labelsKMB and labelsKMG2. Pick one!");
+ k = 1024;
+ k_labels = KMG2_BIG_LABELS;
+ m_labels = KMG2_SMALL_LABELS;
+ }
+
+ var absx = Math.abs(x);
+ var n = pow(k, k_labels.length);
+ for (var j = k_labels.length - 1; j >= 0; j--, n /= k) {
+ if (absx >= n) {
+ label = round_(x / n, digits) + k_labels[j];
+ break;
+ }
+ }
+ if (kmg2) {
+ // TODO(danvk): clean up this logic. Why so different than kmb?
+ var x_parts = String(x.toExponential()).split('e-');
+ if (x_parts.length === 2 && x_parts[1] >= 3 && x_parts[1] <= 24) {
+ if (x_parts[1] % 3 > 0) {
+ label = round_(x_parts[0] /
+ pow(10, (x_parts[1] % 3)),
+ digits);
+ } else {
+ label = Number(x_parts[0]).toFixed(2);
+ }
+ label += m_labels[Math.floor(x_parts[1] / 3) - 1];
+ }
+ }
+ }
+
+ return label;
+};
+
+/**
+ * variant for use as an axisLabelFormatter.
+ * @private
+ */
+export function numberAxisLabelFormatter(x, granularity, opts) {
+ return numberValueFormatter.call(this, x, opts);
+};
+
+/**
+ * @type {!Array.<string>}
+ * @private
+ * @constant
+ */
+var SHORT_MONTH_NAMES_ = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+
+/**
+ * Convert a JS date to a string appropriate to display on an axis that
+ * is displaying values at the stated granularity. This respects the
+ * labelsUTC option.
+ * @param {Date} date The date to format
+ * @param {number} granularity One of the Dygraph granularity constants
+ * @param {Dygraph} opts An options view
+ * @return {string} The date formatted as local time
+ * @private
+ */
+export function dateAxisLabelFormatter(date, granularity, opts) {
+ var utc = opts('labelsUTC');
+ var accessors = utc ? DateAccessorsUTC : DateAccessorsLocal;
+
+ var year = accessors.getFullYear(date),
+ month = accessors.getMonth(date),
+ day = accessors.getDate(date),
+ hours = accessors.getHours(date),
+ mins = accessors.getMinutes(date),
+ secs = accessors.getSeconds(date),
+ millis = accessors.getSeconds(date);
+
+ if (granularity >= DygraphTickers.Granularity.DECADAL) {
+ return '' + year;
+ } else if (granularity >= DygraphTickers.Granularity.MONTHLY) {
+ return SHORT_MONTH_NAMES_[month] + ' ' + year;
+ } else {
+ var frac = hours * 3600 + mins * 60 + secs + 1e-3 * millis;
+ if (frac === 0 || granularity >= DygraphTickers.Granularity.DAILY) {
+ // e.g. '21 Jan' (%d%b)
+ return zeropad(day) + ' ' + SHORT_MONTH_NAMES_[month];
+ } else {
+ return hmsString_(hours, mins, secs);
+ }
+ }
+};
+// alias in case anyone is referencing the old method.
+// Dygraph.dateAxisFormatter = Dygraph.dateAxisLabelFormatter;
+
+/**
+ * Return a string version of a JS date for a value label. This respects the
+ * labelsUTC option.
+ * @param {Date} date The date to be formatted
+ * @param {Dygraph} opts An options view
+ * @private
+ */
+export function dateValueFormatter(d, opts) {
+ return dateString_(d, opts('labelsUTC'));
+};
*/
-// For "production" code, this gets set to false by uglifyjs.
-if (typeof(DEBUG) === 'undefined') DEBUG=true;
+import DygraphLayout from './dygraph-layout';
+import DygraphCanvasRenderer from './dygraph-canvas';
+import DygraphOptions from './dygraph-options';
+import DygraphInteraction from './dygraph-interaction-model';
+import * as DygraphTickers from './dygraph-tickers';
+import * as utils from './dygraph-utils';
+import DEFAULT_ATTRS from './dygraph-default-attrs';
+import OPTIONS_REFERENCE from './dygraph-options-reference';
+
+import DefaultHandler from './datahandler/default';
+import ErrorBarsHandler from './datahandler/bars-error';
+import CustomBarsHandler from './datahandler/bars-custom';
+import DefaultFractionHandler from './datahandler/default-fractions';
+import FractionsBarsHandler from './datahandler/bars-fractions';
+
+import AnnotationsPlugin from './plugins/annotations';
+import AxesPlugin from './plugins/axes';
+import ChartLabelsPlugin from './plugins/chart-labels';
+import GridPlugin from './plugins/grid';
+import LegendPlugin from './plugins/legend';
+import RangeSelectorPlugin from './plugins/range-selector';
+
+import GVizChart from './dygraph-gviz';
-var Dygraph = (function() {
-/*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false,ActiveXObject:false */
"use strict";
/**
Dygraph.ANIMATION_STEPS = 12;
Dygraph.ANIMATION_DURATION = 200;
-// Label constants for the labelsKMB and labelsKMG2 options.
-// (i.e. '100000' -> '100K')
-Dygraph.KMB_LABELS = [ 'K', 'M', 'B', 'T', 'Q' ];
-Dygraph.KMG2_BIG_LABELS = [ 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' ];
-Dygraph.KMG2_SMALL_LABELS = [ 'm', 'u', 'n', 'p', 'f', 'a', 'z', 'y' ];
-
-// These are defined before DEFAULT_ATTRS so that it can refer to them.
-/**
- * @private
- * Return a string version of a number. This respects the digitsAfterDecimal
- * and maxNumberWidth options.
- * @param {number} x The number to be formatted
- * @param {Dygraph} opts An options view
- */
-Dygraph.numberValueFormatter = function(x, opts) {
- var sigFigs = opts('sigFigs');
-
- if (sigFigs !== null) {
- // User has opted for a fixed number of significant figures.
- return Dygraph.floatFormat(x, sigFigs);
- }
-
- var digits = opts('digitsAfterDecimal');
- var maxNumberWidth = opts('maxNumberWidth');
-
- var kmb = opts('labelsKMB');
- var kmg2 = opts('labelsKMG2');
-
- var label;
-
- // switch to scientific notation if we underflow or overflow fixed display.
- if (x !== 0.0 &&
- (Math.abs(x) >= Math.pow(10, maxNumberWidth) ||
- Math.abs(x) < Math.pow(10, -digits))) {
- label = x.toExponential(digits);
- } else {
- label = '' + Dygraph.round_(x, digits);
- }
-
- if (kmb || kmg2) {
- var k;
- var k_labels = [];
- var m_labels = [];
- if (kmb) {
- k = 1000;
- k_labels = Dygraph.KMB_LABELS;
- }
- if (kmg2) {
- if (kmb) console.warn("Setting both labelsKMB and labelsKMG2. Pick one!");
- k = 1024;
- k_labels = Dygraph.KMG2_BIG_LABELS;
- m_labels = Dygraph.KMG2_SMALL_LABELS;
- }
-
- var absx = Math.abs(x);
- var n = Dygraph.pow(k, k_labels.length);
- for (var j = k_labels.length - 1; j >= 0; j--, n /= k) {
- if (absx >= n) {
- label = Dygraph.round_(x / n, digits) + k_labels[j];
- break;
- }
- }
- if (kmg2) {
- // TODO(danvk): clean up this logic. Why so different than kmb?
- var x_parts = String(x.toExponential()).split('e-');
- if (x_parts.length === 2 && x_parts[1] >= 3 && x_parts[1] <= 24) {
- if (x_parts[1] % 3 > 0) {
- label = Dygraph.round_(x_parts[0] /
- Dygraph.pow(10, (x_parts[1] % 3)),
- digits);
- } else {
- label = Number(x_parts[0]).toFixed(2);
- }
- label += m_labels[Math.floor(x_parts[1] / 3) - 1];
- }
- }
- }
-
- return label;
-};
-
-/**
- * variant for use as an axisLabelFormatter.
- * @private
- */
-Dygraph.numberAxisLabelFormatter = function(x, granularity, opts) {
- return Dygraph.numberValueFormatter.call(this, x, opts);
-};
-
-/**
- * @type {!Array.<string>}
- * @private
- * @constant
- */
-Dygraph.SHORT_MONTH_NAMES_ = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-
-
-/**
- * Convert a JS date to a string appropriate to display on an axis that
- * is displaying values at the stated granularity. This respects the
- * labelsUTC option.
- * @param {Date} date The date to format
- * @param {number} granularity One of the Dygraph granularity constants
- * @param {Dygraph} opts An options view
- * @return {string} The date formatted as local time
- * @private
- */
-Dygraph.dateAxisLabelFormatter = function(date, granularity, opts) {
- var utc = opts('labelsUTC');
- var accessors = utc ? Dygraph.DateAccessorsUTC : Dygraph.DateAccessorsLocal;
-
- var year = accessors.getFullYear(date),
- month = accessors.getMonth(date),
- day = accessors.getDate(date),
- hours = accessors.getHours(date),
- mins = accessors.getMinutes(date),
- secs = accessors.getSeconds(date),
- millis = accessors.getSeconds(date);
-
- if (granularity >= Dygraph.DECADAL) {
- return '' + year;
- } else if (granularity >= Dygraph.MONTHLY) {
- return Dygraph.SHORT_MONTH_NAMES_[month] + ' ' + year;
- } else {
- var frac = hours * 3600 + mins * 60 + secs + 1e-3 * millis;
- if (frac === 0 || granularity >= Dygraph.DAILY) {
- // e.g. '21 Jan' (%d%b)
- return Dygraph.zeropad(day) + ' ' + Dygraph.SHORT_MONTH_NAMES_[month];
- } else {
- return Dygraph.hmsString_(hours, mins, secs);
- }
- }
-};
-// alias in case anyone is referencing the old method.
-Dygraph.dateAxisFormatter = Dygraph.dateAxisLabelFormatter;
-
-/**
- * Return a string version of a JS date for a value label. This respects the
- * labelsUTC option.
- * @param {Date} date The date to be formatted
- * @param {Dygraph} opts An options view
- * @private
- */
-Dygraph.dateValueFormatter = function(d, opts) {
- return Dygraph.dateString_(d, opts('labelsUTC'));
-};
-
/**
* Standard plotters. These may be used by clients.
* Available plotters are:
Dygraph.Plotters = DygraphCanvasRenderer._Plotters;
-// Default attribute values.
-Dygraph.DEFAULT_ATTRS = {
- highlightCircleSize: 3,
- highlightSeriesOpts: null,
- highlightSeriesBackgroundAlpha: 0.5,
-
- labelsDivWidth: 250,
- labelsDivStyles: {
- // TODO(danvk): move defaults from createStatusMessage_ here.
- },
- labelsSeparateLines: false,
- labelsShowZeroValues: true,
- labelsKMB: false,
- labelsKMG2: false,
- showLabelsOnHighlight: true,
-
- digitsAfterDecimal: 2,
- maxNumberWidth: 6,
- sigFigs: null,
-
- strokeWidth: 1.0,
- strokeBorderWidth: 0,
- strokeBorderColor: "white",
-
- axisTickSize: 3,
- axisLabelFontSize: 14,
- rightGap: 5,
-
- showRoller: false,
- xValueParser: Dygraph.dateParser,
-
- delimiter: ',',
-
- sigma: 2.0,
- errorBars: false,
- fractions: false,
- wilsonInterval: true, // only relevant if fractions is true
- customBars: false,
- fillGraph: false,
- fillAlpha: 0.15,
- connectSeparatedPoints: false,
-
- stackedGraph: false,
- stackedGraphNaNFill: 'all',
- hideOverlayOnMouseOut: true,
-
- legend: 'onmouseover',
- stepPlot: false,
- avoidMinZero: false,
- xRangePad: 0,
- yRangePad: null,
- drawAxesAtZero: false,
-
- // Sizes of the various chart labels.
- titleHeight: 28,
- xLabelHeight: 18,
- yLabelWidth: 18,
-
- axisLineColor: "black",
- axisLineWidth: 0.3,
- gridLineWidth: 0.3,
- axisLabelColor: "black",
- axisLabelWidth: 50,
- gridLineColor: "rgb(128,128,128)",
-
- interactionModel: null, // will be set to Dygraph.Interaction.defaultModel
- animatedZooms: false, // (for now)
-
- // Range selector options
- showRangeSelector: false,
- rangeSelectorHeight: 40,
- rangeSelectorPlotStrokeColor: "#808FAB",
- rangeSelectorPlotFillGradientColor: "white",
- rangeSelectorPlotFillColor: "#A7B1C4",
- rangeSelectorBackgroundStrokeColor: "gray",
- rangeSelectorBackgroundLineWidth: 1,
- rangeSelectorPlotLineWidth:1.5,
- rangeSelectorForegroundStrokeColor: "black",
- rangeSelectorForegroundLineWidth: 1,
- rangeSelectorAlpha: 0.6,
- showInRangeSelector: null,
-
- // The ordering here ensures that central lines always appear above any
- // fill bars/error bars.
- plotter: [
- Dygraph.Plotters.fillPlotter,
- Dygraph.Plotters.errorPlotter,
- Dygraph.Plotters.linePlotter
- ],
-
- plugins: [ ],
-
- // per-axis options
- axes: {
- x: {
- pixelsPerLabel: 70,
- axisLabelWidth: 60,
- axisLabelFormatter: Dygraph.dateAxisLabelFormatter,
- valueFormatter: Dygraph.dateValueFormatter,
- drawGrid: true,
- drawAxis: true,
- independentTicks: true,
- ticker: null // will be set in dygraph-tickers.js
- },
- y: {
- axisLabelWidth: 50,
- pixelsPerLabel: 30,
- valueFormatter: Dygraph.numberValueFormatter,
- axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
- drawGrid: true,
- drawAxis: true,
- independentTicks: true,
- ticker: null // will be set in dygraph-tickers.js
- },
- y2: {
- axisLabelWidth: 50,
- pixelsPerLabel: 30,
- valueFormatter: Dygraph.numberValueFormatter,
- axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
- drawAxis: true, // only applies when there are two axes of data.
- drawGrid: false,
- independentTicks: false,
- ticker: null // will be set in dygraph-tickers.js
- }
- }
-};
-
-// Directions for panning and zooming. Use bit operations when combined
-// values are possible.
-Dygraph.HORIZONTAL = 1;
-Dygraph.VERTICAL = 2;
-
-// Installed plugins, in order of precedence (most-general to most-specific).
-// Plugins are installed after they are defined, in plugins/install.js.
-Dygraph.PLUGINS = [
-];
-
// Used for initializing annotation CSS rules only once.
Dygraph.addedAnnotationCSS = false;
// user_attrs_ and then computed attrs_. This way Dygraphs can set intelligent
// defaults without overriding behavior that the user specifically asks for.
this.user_attrs_ = {};
- Dygraph.update(this.user_attrs_, attrs);
+ utils.update(this.user_attrs_, attrs);
// This sequence ensures that Dygraph.DEFAULT_ATTRS is never modified.
this.attrs_ = {};
- Dygraph.updateDeep(this.attrs_, Dygraph.DEFAULT_ATTRS);
+ utils.updateDeep(this.attrs_, DEFAULT_ATTRS);
this.boundaryIds_ = [];
this.setIndexByName_ = {};
e.propagationStopped = true;
}
};
- Dygraph.update(e, extra_props);
+ utils.update(e, extra_props);
var callback_plugin_pairs = this.eventListeners_[name];
if (callback_plugin_pairs) {
* @return { ... } The value of the option.
*/
Dygraph.prototype.attr_ = function(name, seriesName) {
- if (DEBUG) {
- if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') {
+ // For "production" code, this gets removed by uglifyjs.
+ if (process.env.NODE_ENV != 'production') {
+ if (typeof(OPTIONS_REFERENCE) === 'undefined') {
console.error('Must include options reference JS for testing');
- } else if (!Dygraph.OPTIONS_REFERENCE.hasOwnProperty(name)) {
+ } else if (!OPTIONS_REFERENCE.hasOwnProperty(name)) {
console.error('Dygraphs is using property ' + name + ', which has no ' +
'entry in the Dygraphs.OPTIONS_REFERENCE listing.');
// Only log this error once.
- Dygraph.OPTIONS_REFERENCE[name] = true;
+ OPTIONS_REFERENCE[name] = true;
}
}
return seriesName ? this.attributes_.getForSeries(name, seriesName) : this.attributes_.get(name);
//
// Use both sides as the exponent in 10^exp and we're done.
// x = 10 ^ (log(xRange[0]) + (pct * (log(xRange[1]) - log(xRange[0])))
- var logr0 = Dygraph.log10(xRange[0]);
- var logr1 = Dygraph.log10(xRange[1]);
+ var logr0 = utils.log10(xRange[0]);
+ var logr1 = utils.log10(xRange[1]);
var exponent = logr0 + (pct * (logr1 - logr0));
- var value = Math.pow(Dygraph.LOG_SCALE, exponent);
+ var value = Math.pow(utils.LOG_SCALE, exponent);
return value;
}
};
//
// Use both sides as the exponent in 10^exp and we're done.
// y = 10 ^ (log(yRange[1]) - (pct * (log(yRange[1]) - log(yRange[0]))));
- var logr0 = Dygraph.log10(yRange[0]);
- var logr1 = Dygraph.log10(yRange[1]);
+ var logr0 = utils.log10(yRange[0]);
+ var logr1 = utils.log10(yRange[1]);
var exponent = logr1 - (pct * (logr1 - logr0));
- var value = Math.pow(Dygraph.LOG_SCALE, exponent);
+ var value = Math.pow(utils.LOG_SCALE, exponent);
return value;
}
};
var pct;
var logscale = this.attributes_.getForAxis("logscale", axis);
if (logscale) {
- var logr0 = Dygraph.log10(yRange[0]);
- var logr1 = Dygraph.log10(yRange[1]);
- pct = (logr1 - Dygraph.log10(y)) / (logr1 - logr0);
+ var logr0 = utils.log10(yRange[0]);
+ var logr1 = utils.log10(yRange[1]);
+ pct = (logr1 - utils.log10(y)) / (logr1 - logr0);
} else {
// yRange[1] - y is unit distance from the bottom.
// yRange[1] - yRange[0] is the scale of the range.
var pct;
var logscale = this.attributes_.getForAxis("logscale", 'x') ;
if (logscale === true) { // logscale can be null so we test for true explicitly.
- var logr0 = Dygraph.log10(xRange[0]);
- var logr1 = Dygraph.log10(xRange[1]);
- pct = (Dygraph.log10(x) - logr0) / (logr1 - logr0);
+ var logr0 = utils.log10(xRange[0]);
+ var logr1 = utils.log10(xRange[1]);
+ pct = (utils.log10(x) - logr0) / (logr1 - logr0);
} else {
// x - xRange[0] is unit distance from the left.
// xRange[1] - xRange[0] is the scale of the range.
enclosing.appendChild(this.graphDiv);
// Create the canvas for interactive parts of the chart.
- this.canvas_ = Dygraph.createCanvas();
+ this.canvas_ = utils.createCanvas();
this.canvas_.style.position = "absolute";
// ... and for static parts of the chart.
this.hidden_ = this.createPlotKitCanvas_(this.canvas_);
- this.canvas_ctx_ = Dygraph.getContext(this.canvas_);
- this.hidden_ctx_ = Dygraph.getContext(this.hidden_);
+ this.canvas_ctx_ = utils.getContext(this.canvas_);
+ this.hidden_ctx_ = utils.getContext(this.hidden_);
this.resizeElements_();
// 2. e.relatedTarget is outside the chart
var target = e.target || e.fromElement;
var relatedTarget = e.relatedTarget || e.toElement;
- if (Dygraph.isNodeContainedBy(target, dygraph.graphDiv) &&
- !Dygraph.isNodeContainedBy(relatedTarget, dygraph.graphDiv)) {
+ if (utils.isNodeContainedBy(target, dygraph.graphDiv) &&
+ !utils.isNodeContainedBy(relatedTarget, dygraph.graphDiv)) {
dygraph.mouseOut_(e);
}
};
this.graphDiv.style.width = this.width_ + "px";
this.graphDiv.style.height = this.height_ + "px";
- var canvasScale = Dygraph.getContextPixelRatio(this.canvas_ctx_);
+ var canvasScale = utils.getContextPixelRatio(this.canvas_ctx_);
this.canvas_.width = this.width_ * canvasScale;
this.canvas_.height = this.height_ * canvasScale;
this.canvas_.style.width = this.width_ + "px"; // for IE
this.canvas_ctx_.scale(canvasScale, canvasScale);
}
- var hiddenScale = Dygraph.getContextPixelRatio(this.hidden_ctx_);
+ var hiddenScale = utils.getContextPixelRatio(this.hidden_ctx_);
this.hidden_.width = this.width_ * hiddenScale;
this.hidden_.height = this.height_ * hiddenScale;
this.hidden_.style.width = this.width_ + "px"; // for IE
this.removeTrackedEvents_();
// remove mouse event handlers (This may not be necessary anymore)
- Dygraph.removeEvent(window, 'mouseout', this.mouseOutHandler_);
- Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
+ utils.removeEvent(window, 'mouseout', this.mouseOutHandler_);
+ utils.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
// remove window handlers
- Dygraph.removeEvent(window,'resize', this.resizeHandler_);
+ utils.removeEvent(window,'resize', this.resizeHandler_);
this.resizeHandler_ = null;
removeRecursive(this.maindiv_);
* @private
*/
Dygraph.prototype.createPlotKitCanvas_ = function(canvas) {
- var h = Dygraph.createCanvas();
+ var h = utils.createCanvas();
h.style.position = "absolute";
// TODO(danvk): h should be offset from canvas. canvas needs to include
// some extra area to make it easier to zoom in on the far left and far
// alternate colors for high contrast.
var idx = i % 2 ? (half + (i + 1)/ 2) : Math.ceil((i + 1) / 2);
var hue = (1.0 * idx / (1 + num));
- colorStr = Dygraph.hsvToRGB(hue, sat, val);
+ colorStr = utils.hsvToRGB(hue, sat, val);
}
}
this.colors_.push(colorStr);
// We cover iframes during mouse interactions. See comments in
// dygraph-utils.js for more info on why this is a good idea.
- tarp: new Dygraph.IFrameTarp(),
+ tarp: new utils.IFrameTarp(),
// contextB is the same thing as this context object but renamed.
initializeMouseDown: function(event, g, contextB) {
event.cancelBubble = true;
}
- var canvasPos = Dygraph.findPos(g.canvas_);
+ var canvasPos = utils.findPos(g.canvas_);
contextB.px = canvasPos.x;
contextB.py = canvasPos.y;
- contextB.dragStartX = Dygraph.dragGetX_(event, contextB);
- contextB.dragStartY = Dygraph.dragGetY_(event, contextB);
+ contextB.dragStartX = utils.dragGetX_(event, contextB);
+ contextB.dragStartY = utils.dragGetY_(event, contextB);
contextB.cancelNextDblclick = false;
contextB.tarp.cover();
},
* dots.
*
* @param {number} direction the direction of the zoom rectangle. Acceptable
- * values are Dygraph.HORIZONTAL and Dygraph.VERTICAL.
+ * values are utils.HORIZONTAL and utils.VERTICAL.
* @param {number} startX The X position where the drag started, in canvas
* coordinates.
* @param {number} endX The current X position of the drag, in canvas coords.
var ctx = this.canvas_ctx_;
// Clean up from the previous rect if necessary
- if (prevDirection == Dygraph.HORIZONTAL) {
+ if (prevDirection == utils.HORIZONTAL) {
ctx.clearRect(Math.min(startX, prevEndX), this.layout_.getPlotArea().y,
Math.abs(startX - prevEndX), this.layout_.getPlotArea().h);
- } else if (prevDirection == Dygraph.VERTICAL) {
+ } else if (prevDirection == utils.VERTICAL) {
ctx.clearRect(this.layout_.getPlotArea().x, Math.min(startY, prevEndY),
this.layout_.getPlotArea().w, Math.abs(startY - prevEndY));
}
// Draw a light-grey rectangle to show the new viewing area
- if (direction == Dygraph.HORIZONTAL) {
+ if (direction == utils.HORIZONTAL) {
if (endX && startX) {
ctx.fillStyle = "rgba(128,128,128,0.33)";
ctx.fillRect(Math.min(startX, endX), this.layout_.getPlotArea().y,
Math.abs(endX - startX), this.layout_.getPlotArea().h);
}
- } else if (direction == Dygraph.VERTICAL) {
+ } else if (direction == utils.VERTICAL) {
if (endY && startY) {
ctx.fillStyle = "rgba(128,128,128,0.33)";
ctx.fillRect(this.layout_.getPlotArea().x, Math.min(startY, endY),
}
var that = this;
- Dygraph.repeatAndCleanup(function(step) {
+ utils.repeatAndCleanup(function(step) {
if (valueRanges.length) {
for (var i = 0; i < that.axes_.length; i++) {
var w = valueRanges[step][i];
if (event.offsetX && event.offsetY) {
return [ event.offsetX, event.offsetY ];
} else {
- var eventElementPos = Dygraph.findPos(this.mouseEventElement_);
- var canvasx = Dygraph.pageX(event) - eventElementPos.x;
- var canvasy = Dygraph.pageY(event) - eventElementPos.y;
+ var eventElementPos = utils.findPos(this.mouseEventElement_);
+ var canvasx = utils.pageX(event) - eventElementPos.x;
+ var canvasy = utils.pageY(event) - eventElementPos.y;
return [canvasx, canvasy];
}
};
var len = points.length;
for (var j = 0; j < len; j++) {
var point = points[j];
- if (!Dygraph.isValidPoint(point, true)) continue;
+ if (!utils.isValidPoint(point, true)) continue;
var dist = Math.abs(point.canvasx - domX);
if (dist < minDistX) {
minDistX = dist;
var points = this.layout_.points[setIdx];
for (var i = 0; i < points.length; ++i) {
point = points[i];
- if (!Dygraph.isValidPoint(point)) continue;
+ if (!utils.isValidPoint(point)) continue;
dx = point.canvasx - domX;
dy = point.canvasy - domY;
dist = dx * dx + dy * dy;
var points = this.layout_.points[setIdx];
if (rowIdx >= points.length) continue;
var p1 = points[rowIdx];
- if (!Dygraph.isValidPoint(p1)) continue;
+ if (!utils.isValidPoint(p1)) continue;
var py = p1.canvasy;
if (domX > p1.canvasx && rowIdx + 1 < points.length) {
// interpolate series Y value using next point
var p2 = points[rowIdx + 1];
- if (Dygraph.isValidPoint(p2)) {
+ if (utils.isValidPoint(p2)) {
var dx = p2.canvasx - p1.canvasx;
if (dx > 0) {
var r = (domX - p1.canvasx) / dx;
} else if (domX < p1.canvasx && rowIdx > 0) {
// interpolate series Y value using previous point
var p0 = points[rowIdx - 1];
- if (Dygraph.isValidPoint(p0)) {
+ if (utils.isValidPoint(p0)) {
var dx = p1.canvasx - p0.canvasx;
if (dx > 0) {
var r = (p1.canvasx - domX) / dx;
that.clearSelection();
}
};
- Dygraph.repeatAndCleanup(
+ utils.repeatAndCleanup(
function(n) {
// ignore simultaneous animations
if (that.animateId != thisId) return;
ctx.save();
for (i = 0; i < this.selPoints_.length; i++) {
var pt = this.selPoints_[i];
- if (!Dygraph.isOK(pt.canvasy)) continue;
+ if (!utils.isOK(pt.canvasy)) continue;
var circleSize = this.getNumericOption('highlightCircleSize', pt.name);
var callback = this.getFunctionOption("drawHighlightPointCallback", pt.name);
var color = this.plotter_.colors[pt.name];
if (!callback) {
- callback = Dygraph.Circles.DEFAULT;
+ callback = utils.Circles.DEFAULT;
}
ctx.lineWidth = this.getNumericOption('strokeWidth', pt.name);
ctx.strokeStyle = color;
handlerClass = this.attr_('dataHandler');
} else if (this.fractions_) {
if (this.getBooleanOption('errorBars')) {
- handlerClass = Dygraph.DataHandlers.FractionsBarsHandler;
+ handlerClass = FractionsBarsHandler;
} else {
- handlerClass = Dygraph.DataHandlers.DefaultFractionHandler;
+ handlerClass = DefaultFractionHandler;
}
} else if (this.getBooleanOption('customBars')) {
- handlerClass = Dygraph.DataHandlers.CustomBarsHandler;
+ handlerClass = CustomBarsHandler;
} else if (this.getBooleanOption('errorBars')) {
- handlerClass = Dygraph.DataHandlers.ErrorBarsHandler;
+ handlerClass = ErrorBarsHandler;
} else {
- handlerClass = Dygraph.DataHandlers.DefaultHandler;
+ handlerClass = DefaultHandler;
}
return handlerClass;
};
for (axis = 0; axis < this.attributes_.numAxes(); axis++) {
// Add a new axis, making a copy of its per-axis options.
opts = { g : this };
- Dygraph.update(opts, this.attributes_.axisOptions(axis));
+ utils.update(opts, this.attributes_.axisOptions(axis));
this.axes_[axis] = opts;
}
Dygraph.prototype.setXAxisOptions_ = function(isDate) {
if (isDate) {
- this.attrs_.xValueParser = Dygraph.dateParser;
- this.attrs_.axes.x.valueFormatter = Dygraph.dateValueFormatter;
- this.attrs_.axes.x.ticker = Dygraph.dateTicker;
- this.attrs_.axes.x.axisLabelFormatter = Dygraph.dateAxisLabelFormatter;
+ this.attrs_.xValueParser = utils.dateParser;
+ this.attrs_.axes.x.valueFormatter = utils.dateValueFormatter;
+ this.attrs_.axes.x.ticker = DygraphTickers.dateTicker;
+ this.attrs_.axes.x.axisLabelFormatter = utils.dateAxisLabelFormatter;
} else {
/** @private (shut up, jsdoc!) */
this.attrs_.xValueParser = function(x) { return parseFloat(x); };
// TODO(danvk): use Dygraph.numberValueFormatter here?
/** @private (shut up, jsdoc!) */
this.attrs_.axes.x.valueFormatter = function(x) { return x; };
- this.attrs_.axes.x.ticker = Dygraph.numericTicks;
+ this.attrs_.axes.x.ticker = DygraphTickers.numericTicks;
this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter;
}
};
*/
Dygraph.prototype.parseCSV_ = function(data) {
var ret = [];
- var line_delimiter = Dygraph.detectLineDelimiter(data);
+ var line_delimiter = utils.detectLineDelimiter(data);
var lines = data.split(line_delimiter || "\n");
var vals, j;
(1 + i) + " ('" + line + "') which is not of this form.");
fields[j] = [0, 0];
} else {
- fields[j] = [Dygraph.parseFloat_(vals[0], i, line),
- Dygraph.parseFloat_(vals[1], i, line)];
+ fields[j] = [utils.parseFloat_(vals[0], i, line),
+ utils.parseFloat_(vals[1], i, line)];
}
}
} else if (this.getBooleanOption("errorBars")) {
(inFields.length - 1) + "): '" + line + "'");
}
for (j = 1; j < inFields.length; j += 2) {
- fields[(j + 1) / 2] = [Dygraph.parseFloat_(inFields[j], i, line),
- Dygraph.parseFloat_(inFields[j + 1], i, line)];
+ fields[(j + 1) / 2] = [utils.parseFloat_(inFields[j], i, line),
+ utils.parseFloat_(inFields[j + 1], i, line)];
}
} else if (this.getBooleanOption("customBars")) {
// Bars are a low;center;high tuple
} else {
vals = val.split(";");
if (vals.length == 3) {
- fields[j] = [ Dygraph.parseFloat_(vals[0], i, line),
- Dygraph.parseFloat_(vals[1], i, line),
- Dygraph.parseFloat_(vals[2], i, line) ];
+ fields[j] = [ utils.parseFloat_(vals[0], i, line),
+ utils.parseFloat_(vals[1], i, line),
+ utils.parseFloat_(vals[2], i, line) ];
} else {
console.warn('When using customBars, values must be either blank ' +
'or "low;center;high" tuples (got "' + val +
} else {
// Values are just numbers
for (j = 1; j < inFields.length; j++) {
- fields[j] = Dygraph.parseFloat_(inFields[j], i, line);
+ fields[j] = utils.parseFloat_(inFields[j], i, line);
}
}
if (ret.length > 0 && fields[0] < ret[ret.length - 1][0]) {
}
}
- if (Dygraph.isDateLike(data[0][0])) {
+ if (utils.isDateLike(data[0][0])) {
// Some intelligent defaults for a date x-axis.
- this.attrs_.axes.x.valueFormatter = Dygraph.dateValueFormatter;
- this.attrs_.axes.x.ticker = Dygraph.dateTicker;
- this.attrs_.axes.x.axisLabelFormatter = Dygraph.dateAxisLabelFormatter;
+ this.attrs_.axes.x.valueFormatter = utils.dateValueFormatter;
+ this.attrs_.axes.x.ticker = DygraphTickers.dateTicker;
+ this.attrs_.axes.x.axisLabelFormatter = utils.dateAxisLabelFormatter;
// Assume they're all dates.
- var parsedData = Dygraph.clone(data);
+ var parsedData = utils.clone(data);
for (i = 0; i < data.length; i++) {
if (parsedData[i].length === 0) {
console.error("Row " + (1 + i) + " of data is empty");
// Some intelligent defaults for a numeric x-axis.
/** @private (shut up, jsdoc!) */
this.attrs_.axes.x.valueFormatter = function(x) { return x; };
- this.attrs_.axes.x.ticker = Dygraph.numericTicks;
- this.attrs_.axes.x.axisLabelFormatter = Dygraph.numberAxisLabelFormatter;
+ this.attrs_.axes.x.ticker = DygraphTickers.numericTicks;
+ this.attrs_.axes.x.axisLabelFormatter = utils.numberAxisLabelFormatter;
return data;
}
};
var indepType = data.getColumnType(0);
if (indepType == 'date' || indepType == 'datetime') {
- this.attrs_.xValueParser = Dygraph.dateParser;
- this.attrs_.axes.x.valueFormatter = Dygraph.dateValueFormatter;
- this.attrs_.axes.x.ticker = Dygraph.dateTicker;
- this.attrs_.axes.x.axisLabelFormatter = Dygraph.dateAxisLabelFormatter;
+ this.attrs_.xValueParser = utils.dateParser;
+ this.attrs_.axes.x.valueFormatter = utils.dateValueFormatter;
+ this.attrs_.axes.x.ticker = DygraphTickers.dateTicker;
+ this.attrs_.axes.x.axisLabelFormatter = utils.dateAxisLabelFormatter;
} else if (indepType == 'number') {
this.attrs_.xValueParser = function(x) { return parseFloat(x); };
this.attrs_.axes.x.valueFormatter = function(x) { return x; };
- this.attrs_.axes.x.ticker = Dygraph.numericTicks;
+ this.attrs_.axes.x.ticker = DygraphTickers.numericTicks;
this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter;
} else {
throw new Error(
data = data();
}
- if (Dygraph.isArrayLike(data)) {
+ if (utils.isArrayLike(data)) {
this.rawData_ = this.parseArray_(data);
this.cascadeDataDidUpdateEvent_();
this.predraw_();
this.predraw_();
} else if (typeof data == 'string') {
// Heuristic: a newline means it's CSV data. Otherwise it's an URL.
- var line_delimiter = Dygraph.detectLineDelimiter(data);
+ var line_delimiter = utils.detectLineDelimiter(data);
if (line_delimiter) {
this.loadedEvent_(data);
} else {
// highlightCircleSize
// Check if this set options will require new points.
- var requiresNewPoints = Dygraph.isPixelChangingOptionList(this.attr_("labels"), attrs);
+ var requiresNewPoints = utils.isPixelChangingOptionList(this.attr_("labels"), attrs);
- Dygraph.updateDeep(this.user_attrs_, attrs);
+ utils.updateDeep(this.user_attrs_, attrs);
this.attributes_.reparseSeries();
console.warn("Unable to add default annotation CSS rule; display may be off.");
};
-if (typeof exports === "object" && typeof module !== "undefined") {
- module.exports = Dygraph;
-}
+/**
+ * Add an event handler. This event handler is kept until the graph is
+ * destroyed with a call to graph.destroy().
+ *
+ * @param {!Node} elem The element to add the event to.
+ * @param {string} type The type of the event, e.g. 'click' or 'mousemove'.
+ * @param {function(Event):(boolean|undefined)} fn The function to call
+ * on the event. The function takes one parameter: the event object.
+ * @private
+ */
+Dygraph.prototype.addAndTrackEvent = function(elem, type, fn) {
+ utils.addEvent(elem, type, fn);
+ this.registeredEvents_.push({elem, type, fn});
+};
-return Dygraph;
+Dygraph.prototype.removeTrackedEvents_ = function() {
+ if (this.registeredEvents_) {
+ for (var idx = 0; idx < this.registeredEvents_.length; idx++) {
+ var reg = this.registeredEvents_[idx];
+ utils.removeEvent(reg.elem, reg.type, reg.fn);
+ }
+ }
+
+ this.registeredEvents_ = [];
+};
+
+
+// Installed plugins, in order of precedence (most-general to most-specific).
+Dygraph.PLUGINS = [
+ LegendPlugin,
+ AxesPlugin,
+ RangeSelectorPlugin, // Has to be before ChartLabels so that its callbacks are called after ChartLabels' callbacks.
+ ChartLabelsPlugin,
+ AnnotationsPlugin,
+ GridPlugin
+];
-})();
+// There are many symbols which have historically been available through the
+// Dygraph class. These are exported here for backwards compatibility.
+Dygraph.GVizChart = GVizChart;
+Dygraph.DASHED_LINE = utils.DASHED_LINE;
+Dygraph.DOT_DASH_LINE = utils.DOT_DASH_LINE;
+Dygraph.dateAxisLabelFormatter = utils.dateAxisLabelFormatter;
+Dygraph.toRGB_ = utils.toRGB_;
+Dygraph.findPos = utils.findPos;
+Dygraph.pageX = utils.pageX;
+Dygraph.pageY = utils.pageY;
+Dygraph.dateString_ = utils.dateString_;
+Dygraph.defaultInteractionModel = DygraphInteraction.defaultModel;
+Dygraph.nonInteractiveModel = Dygraph.nonInteractiveModel_ = DygraphInteraction.nonInteractiveModel_;
+Dygraph.Circles = utils.Circles;
+
+Dygraph.Plugins = {
+ Legend: LegendPlugin,
+ Axes: AxesPlugin,
+ // ...
+};
+Dygraph.DataHandlers = {
+ DefaultHandler
+};
+
+Dygraph.startPan = DygraphInteraction.startPan;
+Dygraph.startZoom = DygraphInteraction.startZoom;
+Dygraph.movePan = DygraphInteraction.movePan;
+Dygraph.moveZoom = DygraphInteraction.moveZoom;
+Dygraph.endPan = DygraphInteraction.endPan;
+Dygraph.endZoom = DygraphInteraction.endZoom;
+
+Dygraph.numericLinearTicks = DygraphTickers.numericLinearTicks;
+Dygraph.numericTicks = DygraphTickers.numericTicks;
+Dygraph.dateTicker = DygraphTickers.dateTicker;
+Dygraph.Granularity = DygraphTickers.Granularity;
+Dygraph.getDateAxis = DygraphTickers.getDateAxis;
+Dygraph.floatFormat = utils.floatFormat;
+
+export default Dygraph;
/*global Dygraph:false */
(function() {
+
"use strict";
+ // Matches DefaultHandler.parseFloat
+ var parseFloat = function(val) {
+ if (val === null) return NaN;
+ return val;
+ };
+
Dygraph.DataHandlers.RebaseHandler = function(baseOpt) {
this.baseOpt = baseOpt;
};
for (var i = 0; i <= lastIdx; ++i) {
var item = series[i];
var yraw = item[1];
- var yval = yraw === null ? null : Dygraph.DataHandler.parseFloat(yraw);
+ var yval = yraw === null ? null : parseFloat(yraw);
if (yval !== null) {
if (i === firstIdx) {
yval = (this.baseOpt === "percent") ? 0 : this.baseOpt;
var point = {
x: NaN,
y: NaN,
- xval: Dygraph.DataHandler.parseFloat(item[0]),
+ xval: parseFloat(item[0]),
yval: yval,
name: setName,
idx: i + boundaryIdStart
};
};
-Dygraph.update(Dygraph.Circles, {
+var customCircles = {
TRIANGLE : shapeFunction(3),
SQUARE : shapeFunction(4, Math.PI / 4),
DIAMOND : shapeFunction(4),
ctx.closePath();
ctx.stroke();
}
-});
+};
+
+for (var k in customCircles) {
+ if (!customCircles.hasOwnProperty(k)) continue;
+ Dygraph.Circles[k] = customCircles[k];
+}
})();
-var smoothPlotter = (function() {
+(function() {
"use strict";
+var Dygraph;
+if (window.Dygraph) {
+ Dygraph = window.Dygraph;
+} else if (typeof(module) !== 'undefined') {
+ Dygraph = require('../dygraph');
+}
+
/**
* Given three sequential points, p0, p1 and p2, find the left and right
* control points for p1.
return [l1x, l1y, r1x, r1y];
}
+// i.e. is none of (null, undefined, NaN)
+function isOK(x) {
+ return !!x && !isNaN(x);
+};
// A plotter which uses splines to create a smooth curve.
// See tests/plotters.html for a demo.
// right control point for previous point
var lastRightX = points[0].canvasx, lastRightY = points[0].canvasy;
- var isOK = Dygraph.isOK; // i.e. is none of (null, undefined, NaN)
for (var i = 1; i < points.length; i++) {
var p0 = points[i - 1],
smoothPlotter.smoothing = 1/3;
smoothPlotter._getControlPoints = getControlPoints; // for testing
-return smoothPlotter;
+// older versions exported a global.
+// This will be removed in the future.
+// The preferred way to access smoothPlotter is via Dygraph.smoothPlotter.
+window.smoothPlotter = smoothPlotter;
+Dygraph.smoothPlotter = smoothPlotter;
})();
/* global Dygraph:false */
'use strict';
-Dygraph.synchronize = function(/* dygraphs..., opts */) {
+var Dygraph;
+if (window.Dygraph) {
+ Dygraph = window.Dygraph;
+} else if (typeof(module) !== 'undefined') {
+ Dygraph = require('../dygraph');
+}
+
+var synchronize = function(/* dygraphs..., opts */) {
if (arguments.length === 0) {
throw 'Invalid invocation of Dygraph.synchronize(). Need >= 1 argument.';
}
}
}
+Dygraph.synchronize = synchronize;
+
})();
/*global Dygraph:false */
-Dygraph.Plugins.Annotations = (function() {
-
"use strict";
/**
layout.
TODO(danvk): cache DOM elements.
-
*/
var annotations = function() {
this.detachLabels();
};
-return annotations;
-
-})();
+export default annotations;
/*global Dygraph:false */
-Dygraph.Plugins.Axes = (function() {
-
'use strict';
/*
context.restore();
};
-return axes;
-})();
+export default axes;
*/
/*global Dygraph:false */
-Dygraph.Plugins.ChartLabels = (function() {
-
"use strict";
// TODO(danvk): move chart label options out of dygraphs and into the plugin.
this.detachLabels_();
};
-
-return chart_labels;
-})();
+export default chart_labels;
*/
/*global Dygraph:false */
-Dygraph.Plugins.Grid = (function() {
-
/*
Current bits of jankiness:
for (i = 0; i < ticks.length; i++) {
var axis = ticks[i][0];
if(drawGrid[axis]) {
+ ctx.save();
if (stroking[axis]) {
- ctx.installPattern(strokePattern[axis]);
+ if (ctx.setLineDash) ctx.setLineDash(strokePattern[axis]);
}
ctx.strokeStyle = strokeStyles[axis];
ctx.lineWidth = lineWidths[axis];
ctx.beginPath();
ctx.moveTo(x, y);
ctx.lineTo(x + area.w, y);
- ctx.closePath();
ctx.stroke();
- if (stroking[axis]) {
- ctx.uninstallPattern();
- }
+ ctx.restore();
}
}
ctx.restore();
var strokePattern = g.getOptionForAxis('gridLinePattern', 'x');
var stroking = strokePattern && (strokePattern.length >= 2);
if (stroking) {
- ctx.installPattern(strokePattern);
+ if (ctx.setLineDash) ctx.setLineDash(strokePattern);
}
ctx.strokeStyle = g.getOptionForAxis('gridLineColor', 'x');
ctx.lineWidth = g.getOptionForAxis('gridLineWidth', 'x');
ctx.stroke();
}
if (stroking) {
- ctx.uninstallPattern();
+ if (ctx.setLineDash) ctx.setLineDash([]);
}
ctx.restore();
}
grid.prototype.destroy = function() {
};
-return grid;
-
-})();
+export default grid;
*/
/*global Dygraph:false */
-Dygraph.Plugins.Legend = (function() {
/*
Current bits of jankiness:
- Uses two private APIs:
/*global Dygraph:false */
"use strict";
+import * as utils from '../dygraph-utils';
+
/**
* Creates the legend, which appears when the user hovers over the chart.
*
* @constructor
*/
-var legend = function() {
+var Legend = function() {
this.legend_div_ = null;
this.is_generated_div_ = false; // do we own this div, or was it user-specified?
};
-legend.prototype.toString = function() {
+Legend.prototype.toString = function() {
return "Legend Plugin";
};
* @param {Dygraph} g Graph instance.
* @return {object.<string, function(ev)>} Mapping of event names to callbacks.
*/
-legend.prototype.activate = function(g) {
+Legend.prototype.activate = function(g) {
var div;
var divWidth = g.getOption('labelsDivWidth');
"overflow": "hidden"};
// TODO(danvk): get rid of labelsDivStyles? CSS is better.
- Dygraph.update(messagestyle, g.getOption('labelsDivStyles'));
+ utils.update(messagestyle, g.getOption('labelsDivStyles'));
div = document.createElement("div");
div.className = "dygraph-legend";
for (var name in messagestyle) {
return str.replace(/&/g, "&").replace(/"/g, """).replace(/</g, "<").replace(/>/g, ">");
};
-legend.prototype.select = function(e) {
+Legend.prototype.select = function(e) {
var xValue = e.selectedX;
var points = e.selectedPoints;
var row = e.selectedRow;
this.legend_div_.style.top = topLegend + "px";
}
- var html = legend.generateLegendHTML(e.dygraph, xValue, points, this.one_em_width_, row);
+ var html = Legend.generateLegendHTML(e.dygraph, xValue, points, this.one_em_width_, row);
this.legend_div_.innerHTML = html;
this.legend_div_.style.display = '';
};
-legend.prototype.deselect = function(e) {
+Legend.prototype.deselect = function(e) {
var legendMode = e.dygraph.getOption('legend');
if (legendMode !== 'always') {
this.legend_div_.style.display = "none";
var oneEmWidth = calculateEmWidthInDiv(this.legend_div_);
this.one_em_width_ = oneEmWidth;
- var html = legend.generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth, null);
+ var html = Legend.generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth, null);
this.legend_div_.innerHTML = html;
};
-legend.prototype.didDrawChart = function(e) {
+Legend.prototype.didDrawChart = function(e) {
this.deselect(e);
};
* - its top edge is flush with the top edge of the charting area
* @private
*/
-legend.prototype.predraw = function(e) {
+Legend.prototype.predraw = function(e) {
// Don't touch a user-specified labelsDiv.
if (!this.is_generated_div_) return;
* Called when dygraph.destroy() is called.
* You should null out any references and detach any DOM elements.
*/
-legend.prototype.destroy = function() {
+Legend.prototype.destroy = function() {
this.legend_div_ = null;
};
* 'always'}) and with dashed lines.
* @param {number} row The selected row index.
*/
-legend.generateLegendHTML = function(g, x, sel_points, oneEmWidth, row) {
+Legend.generateLegendHTML = function(g, x, sel_points, oneEmWidth, row) {
// TODO(danvk): deprecate this option in place of {legend: 'never'}
if (g.getOption('showLabelsOnHighlight') !== true) return '';
for (i = 0; i < sel_points.length; i++) {
var pt = sel_points[i];
if (pt.yval === 0 && !showZeros) continue;
- if (!Dygraph.isOK(pt.canvasy)) continue;
+ if (!utils.isOK(pt.canvasy)) continue;
if (sepLines) html += "<br/>";
var series = g.getPropertiesForSeries(pt.name);
return dash;
};
-
-return legend;
-})();
+export default Legend;
* a timeline range selector widget for dygraphs.
*/
-Dygraph.Plugins.RangeSelector = (function() {
-
/*global Dygraph:false */
"use strict";
+import * as utils from '../dygraph-utils';
+import DygraphInteraction from '../dygraph-interaction-model';
+
var rangeSelector = function() {
this.hasTouchInterface_ = typeof(TouchEvent) != 'undefined';
this.isMobileDevice_ = /mobile|android/gi.test(navigator.appVersion);
*/
rangeSelector.prototype.resize_ = function() {
function setElementRect(canvas, context, rect) {
- var canvasScale = Dygraph.getContextPixelRatio(context);
+ var canvasScale = utils.getContextPixelRatio(context);
canvas.style.top = rect.y + 'px';
canvas.style.left = rect.x + 'px';
* Creates the background and foreground canvases.
*/
rangeSelector.prototype.createCanvases_ = function() {
- this.bgcanvas_ = Dygraph.createCanvas();
+ this.bgcanvas_ = utils.createCanvas();
this.bgcanvas_.className = 'dygraph-rangesel-bgcanvas';
this.bgcanvas_.style.position = 'absolute';
this.bgcanvas_.style.zIndex = 9;
- this.bgcanvas_ctx_ = Dygraph.getContext(this.bgcanvas_);
+ this.bgcanvas_ctx_ = utils.getContext(this.bgcanvas_);
- this.fgcanvas_ = Dygraph.createCanvas();
+ this.fgcanvas_ = utils.createCanvas();
this.fgcanvas_.className = 'dygraph-rangesel-fgcanvas';
this.fgcanvas_.style.position = 'absolute';
this.fgcanvas_.style.zIndex = 9;
this.fgcanvas_.style.cursor = 'default';
- this.fgcanvas_ctx_ = Dygraph.getContext(this.fgcanvas_);
+ this.fgcanvas_ctx_ = utils.getContext(this.fgcanvas_);
};
/**
// We cover iframes during mouse interactions. See comments in
// dygraph-utils.js for more info on why this is a good idea.
- var tarp = new Dygraph.IFrameTarp();
+ var tarp = new utils.IFrameTarp();
// functions, defined below. Defining them this way (rather than with
// "function foo() {...}" makes JSHint happy.
};
onZoomStart = function(e) {
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
isZooming = true;
clientXLast = e.clientX;
handle = e.target ? e.target : e.srcElement;
if (e.type === 'mousedown' || e.type === 'dragstart') {
// These events are removed manually.
- Dygraph.addEvent(topElem, 'mousemove', onZoom);
- Dygraph.addEvent(topElem, 'mouseup', onZoomEnd);
+ utils.addEvent(topElem, 'mousemove', onZoom);
+ utils.addEvent(topElem, 'mouseup', onZoomEnd);
}
self.fgcanvas_.style.cursor = 'col-resize';
tarp.cover();
if (!isZooming) {
return false;
}
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
var delX = e.clientX - clientXLast;
if (Math.abs(delX) < 4) {
}
isZooming = false;
tarp.uncover();
- Dygraph.removeEvent(topElem, 'mousemove', onZoom);
- Dygraph.removeEvent(topElem, 'mouseup', onZoomEnd);
+ utils.removeEvent(topElem, 'mousemove', onZoom);
+ utils.removeEvent(topElem, 'mouseup', onZoomEnd);
self.fgcanvas_.style.cursor = 'default';
// If on a slower device, zoom now.
onPanStart = function(e) {
if (!isPanning && isMouseInPanZone(e) && self.getZoomHandleStatus_().isZoomed) {
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
isPanning = true;
clientXLast = e.clientX;
if (e.type === 'mousedown') {
// These events are removed manually.
- Dygraph.addEvent(topElem, 'mousemove', onPan);
- Dygraph.addEvent(topElem, 'mouseup', onPanEnd);
+ utils.addEvent(topElem, 'mousemove', onPan);
+ utils.addEvent(topElem, 'mouseup', onPanEnd);
}
return true;
}
if (!isPanning) {
return false;
}
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
var delX = e.clientX - clientXLast;
if (Math.abs(delX) < 4) {
return false;
}
isPanning = false;
- Dygraph.removeEvent(topElem, 'mousemove', onPan);
- Dygraph.removeEvent(topElem, 'mouseup', onPanEnd);
+ utils.removeEvent(topElem, 'mousemove', onPan);
+ utils.removeEvent(topElem, 'mouseup', onPanEnd);
// If on a slower device, do pan now.
if (!dynamic) {
doPan();
onZoomHandleTouchEvent = function(e) {
if (e.type == 'touchstart' && e.targetTouches.length == 1) {
if (onZoomStart(e.targetTouches[0])) {
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
}
} else if (e.type == 'touchmove' && e.targetTouches.length == 1) {
if (onZoom(e.targetTouches[0])) {
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
}
} else {
onZoomEnd(e);
onCanvasTouchEvent = function(e) {
if (e.type == 'touchstart' && e.targetTouches.length == 1) {
if (onPanStart(e.targetTouches[0])) {
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
}
} else if (e.type == 'touchmove' && e.targetTouches.length == 1) {
if (onPan(e.targetTouches[0])) {
- Dygraph.cancelEvent(e);
+ utils.cancelEvent(e);
}
} else {
onPanEnd(e);
}
};
- this.setDefaultOption_('interactionModel', Dygraph.Interaction.dragIsPanInteractionModel);
+ this.setDefaultOption_('interactionModel', DygraphInteraction.dragIsPanInteractionModel);
this.setDefaultOption_('panEdgeFraction', 0.0001);
var dragStartEvent = window.opera ? 'mousedown' : 'dragstart';
// Also, expand the Y range to compress the mini plot a little.
var extraPercent = 0.25;
if (logscale) {
- yMax = Dygraph.log10(yMax);
+ yMax = utils.log10(yMax);
yMax += yMax*extraPercent;
- yMin = Dygraph.log10(yMin);
+ yMin = utils.log10(yMin);
for (i = 0; i < combinedSeries.length; i++) {
- combinedSeries[i][1] = Dygraph.log10(combinedSeries[i][1]);
+ combinedSeries[i][1] = utils.log10(combinedSeries[i][1]);
}
} else {
var yExtra;
};
};
-return rangeSelector;
-
-})();
+export default rangeSelector;
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type='text/javascript' src='http://www.google.com/jsapi'></script>
<script type='text/javascript'>
<html>
<head>
<title>Native format annotations</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
<p>This test demonstrates how annotations can be used with <a href="http://dygraphs.com/data.html#array">native-format</a> data.</p>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type="text/css">
.annotation {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
<html>
<head>
<title>Charting combinations</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
.chart {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="../src/extras/crosshair.js"></script>
<script type="text/javascript" src="data.js"></script>
<html>
<head>
<title>demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style>
/* Changing 'body' -> 'html, body' triggers a bug */
body {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="../src/extras/shapes.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
rollPeriod: 14,
errorBars: true,
labelsSeparateLines: true,
- yAxisLabelWidth: 20
+ axes: {
+ y: {
+ axisLabelWidth: 20
+ }
+ }
}
);
</script>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
'boxShadow': '4px 4px 4px #888'
},
labelsSeparateLines: true,
- yAxisLabelWidth: 20
+ axes: {
+ y: {
+ axisLabelWidth: 20
+ }
+ }
}
);
</script>
<html>
-<head>
- <script src="../dashed-canvas.js"></script>
-</head>
<body>
<p>You should see solid black and blue lines with a dashed red line in between
them:</p>
ctx.stroke();
// Draw a dashed line segment.
-ctx.installPattern([10, 10]);
+// ctx.installPattern([10, 10]);
+ctx.setLineDash([10, 10]);
ctx.strokeStyle = 'red';
ctx.beginPath();
ctx.moveTo(100, 50);
ctx2.lineTo(600, 50);
ctx2.stroke();
-ctx.uninstallPattern();
+// ctx.uninstallPattern();
+ctx.setLineDash([]);
// Now that we've uninstalled the pattern, should be normal again.
ctx.strokeStyle = 'blue';
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style>
body {
<html>
<head>
<title>demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <!--
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
+ -->
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
<h2>Demo</h2>
title: 'Interesting Shapes',
xlabel: 'Date',
ylabel: 'Count',
- axisLineColor: 'white'
+ axisLineColor: 'white',
+ showRangeSelector: true
// drawXGrid: false
}
);
<html>
<head>
<title>dense, filled plots</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style>
.chart {
width: 800px;
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script>
var start_date = new Date("2002/12/29").getTime();
if (tool == 'zoom') {
Dygraph.defaultInteractionModel.mousedown(event, g, context);
} else {
- // prevents mouse drags from selecting page text.
- if (event.preventDefault) {
- event.preventDefault(); // Firefox, Chrome, etc.
- } else {
- event.returnValue = false; // IE
- event.cancelBubble = true;
- }
+ event.preventDefault(); // Firefox, Chrome, etc.
isDrawing = true;
setPoint(event, g, context);
}
g.updateOptions({
dateWindow: dateWindow
});
- Dygraph.cancelEvent(event);
+ event.preventDefault();
}
},
strokeWidth: 1.5,
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
windowProps[k] = true;
}
</script>
- <!--
- <script type="text/javascript" src="../dygraph-dev.js"></script>
- -->
- <script type="text/javascript" src="../dygraph-combined.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript">
for (k in window) {
if (!windowProps.hasOwnProperty(k)) {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">
<html>
<head>
<title>Hairlines demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<!-- Include the Javascript for the plug-in -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<link rel='stylesheet' href='http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css' />
- <script type="text/javascript" src="../extras/hairlines.js"></script>
- <script type="text/javascript" src="../extras/super-annotations.js"></script>
+ <script type="text/javascript" src="../src/extras/hairlines.js"></script>
+ <script type="text/javascript" src="../src/extras/super-annotations.js"></script>
<style>
#demodiv {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
<html>
<head>
<title>demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type="text/css">
.chart {
<iframe id="iframe" width=400 height=520 src="http://en.wikipedia.org/">iframe here</iframe>
<p>Click on various places in the chart, then drag the mouse over the iframe
- and release it. When you mouse back over the charts, strange things will
+ and release it. When you mouse back over the charts, strange things shouldn't
happen.</p>
<script type="text/javascript">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type="text/css">
.thinborder {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<script type="text/javascript" src="interaction.js"></script>
</table>
<script type="text/javascript">
- Dygraph.addEvent(document, "mousewheel", function() { lastClickedGraph = null; });
- Dygraph.addEvent(document, "click", function() { lastClickedGraph = null; });
+ document.addEventListener("mousewheel", function() {
+ lastClickedGraph = null;
+ }, false);
+ document.addEventListener("click", function() { lastClickedGraph = null; }, false);
var g = new Dygraph(document.getElementById("div_g"),
NoisyData, { errorBars : true });
var s = document.getElementById("g2_console");
function clickV3(event, g, context) {
lastClickedGraph = g;
- Dygraph.cancelEvent(event);
+ event.preventDefault();
+ event.stopPropagation();
}
function scrollV3(event, g, context) {
var yPct = percentages[1];
zoom(g, percentage, xPct, yPct);
- Dygraph.cancelEvent(event);
+ event.preventDefault();
+ event.stopPropagation();
}
// Adjusts [x, y] toward each other by zoomInPercentage%
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
});
var g3 = new Dygraph(document.getElementById("labelsKMG2yValueFormatter"), data, {
labelsKMG2: true,
- yValueFormatter: formatValue,
+ axes: {
+ y: {
+ valueFormatter: formatValue
+ }
+ },
labels: ['Base', 'Power']
});
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type="text/css">
body { max-width: 640 px; }
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type="text/css">
body { max-width: 640 px; }
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type="text/css">
body { max-width: 640 px; }
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<div id="div_g1" style="width:600px; height:300px;"></div>
<script type="text/javascript">
- Dygraph.Interaction.DEBUG = true;
-
function data0() {
return "Date,A\n" +
"20101201,5\n"+
"7,0\n"+
"8,100\n"+
"9,500\n"+
- "101,500\n"+
"30,500\n"+
"50,400\n"+
"100,300\n"+
+ "101,500\n"+
"300,200\n"+
"1000,100\n"+
"";
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
<html>
<head>
<title>multi-scale</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type="text/css">
body {
line-height: 150%;
title: 'Four series on the same scale',
xlabel: 'Date',
ylabel: 'Count',
- yAxisLabelWidth: 80
+ axes: {
+ y: {
+ axisLabelWidth: 80
+ }
+ }
}
);
</script>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript">
function plot() {
<html>
<head>
<title>Plotters demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
<html>
<head>
<title>plugins demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<!-- Include the Javascript for the plug-in -->
- <script type="text/javascript" src="../extras/unzoom.js"></script>
+ <script type="text/javascript" src="../src/extras/unzoom.js"></script>
</head>
<body>
<h2>Plugins Demo</h2>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
drawAxis : false
}
},
+ labels: ['X', 'Y'],
showRangeSelector: true,
rangeSelectorHeight: 30
}
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<style type='text/css'>
.few .dygraph-legend > span.highlight { border: 1px solid grey; }
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
<html>
<head>
<title>Plotters demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
- <script type="text/javascript" src="../extras/smooth-plotter.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
+ <script type="text/javascript" src="../src/extras/smooth-plotter.js"></script>
<style type="text/css">
body {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
document.getElementById("div_g"),
data, {
rollPeriod: 7,
- pixelsPerYLabel: 20
+ axes: {
+ y: {
+ pixelsPerLabel: 20
+ }
+ }
}
);
g2 = new Dygraph(
document.getElementById("div_g2"),
data, {
rollPeriod: 7,
- pixelsPerYLabel: 20
+ axes: {
+ y: {
+ pixelsPerLabel: 20
+ }
+ }
}
);
</script>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
<html>
<head>
<title>Straw broom charts demo</title>
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="../src/extras/synchronizer.js"></script>
<script type="text/javascript" src="../src/extras/rebase.js"></script>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="../src/extras/synchronizer.js"></script>
<script type="text/javascript" src="data.js"></script>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
},
ylabel: 'Primary y-axis',
y2label: 'Secondary y-axis',
- yAxisLabelWidth: 60
+ axes: {
+ y: {
+ axisLabelWidth: 60
+ }
+ }
}
);
},
axes: {
y: {
- valueRange: [40, 80]
+ valueRange: [40, 80],
+ axisLabelWidth: 60
},
y2: {
// set axis-related properties here
}
},
ylabel: 'Primary y-axis',
- y2label: 'Secondary y-axis',
- yAxisLabelWidth: 60
+ y2label: 'Secondary y-axis'
}
);
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
},
},
axes: {
+ y: {
+ axisLabelWidth: 60
+ },
y2: {
// set axis-related properties here
labelsKMB: true
},
ylabel: 'Primary y-axis',
y2label: 'Secondary y-axis',
- yAxisLabelWidth: 60
}
);
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
<style type="text/css">
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body style="max-width: 800px;">
'Y3': { axis: 'y2' },
'Y4': { axis: 'y2' }
},
- xAxisLabelWidth: 100,
- yAxisLabelWidth: 100,
axes: {
x: {
valueFormatter: function(ms) {
return 'xalf(' + formatDate(d) + ')';
},
pixelsPerLabel: 100,
+ axisLabelWidth: 100,
},
y: {
valueFormatter: function(y) {
},
axisLabelFormatter: function(y) {
return 'yalf(' + y.toPrecision(2) + ')';
- }
+ },
+ axisLabelWidth: 100
},
y2: {
valueFormatter: function(y2) {
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
"2009/07/12 05:00:00,3,6\n" +
"2009/07/12 06:00:00,4,6"
}
+ function zeropad(x) {
+ return (x < 10) ? '0' + x : x;
+ }
var g1 = new Dygraph(
document.getElementById("normal"),
document.getElementById("seconds"),
HourlyData(),
{
- xAxisLabelWidth: 70,
axes: {
x: {
+ axisLabelWidth: 70,
axisLabelFormatter: function(d, gran) {
- return Dygraph.zeropad(d.getHours()) + ":"
- + Dygraph.zeropad(d.getMinutes()) + ":"
- + Dygraph.zeropad(d.getSeconds());
+ return zeropad(d.getHours()) + ":"
+ + zeropad(d.getMinutes()) + ":"
+ + zeropad(d.getSeconds());
}
}
}
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
</head>
<body>
For production (minified) code, use:
<script type="text/javascript" src="dygraph-combined.js"></script>
-->
- <script type="text/javascript" src="../dygraph-dev.js"></script>
+ <script type="text/javascript" src="../dist/dygraph.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
projects / dygraphs.git / commitdiff