From: Dan Vanderkam Date: Sun, 25 Oct 2015 04:09:25 +0000 (-0400) Subject: Merge pull request #674 from danvk/module X-Git-Tag: v2.0.0~38 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=ce31caf22475e3e1fd6d9fea192d61ff4fcd7fac;hp=a4c3ece0a11e4e5c4f1f51a8bc8b7878d34ee052;p=dygraphs.git Merge pull request #674 from danvk/module Use ES6 modules --- diff --git a/.gitignore b/.gitignore index 01b10ac..121cd66 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ docs/options.html node_modules env dist +coverage +*.log diff --git a/.travis.yml b/.travis.yml index e33129b..cbda81c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,10 @@ node_js: 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 diff --git a/DEVELOP.md b/DEVELOP.md index 8ddf024..7436326 100644 --- a/DEVELOP.md +++ b/DEVELOP.md @@ -8,19 +8,25 @@ This is a step-by-step guide explaining how to do it. 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 diff --git a/README.md b/README.md index 7e3b0f2..9abb9a1 100644 --- a/README.md +++ b/README.md @@ -51,19 +51,11 @@ seeing demonstrations of what dygraphs can do in the 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. diff --git a/auto_tests/chrome.karma.conf.js b/auto_tests/chrome.karma.conf.js deleted file mode 100644 index 0caceb6..0000000 --- a/auto_tests/chrome.karma.conf.js +++ /dev/null @@ -1,28 +0,0 @@ -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' - ] - }); -}; diff --git a/auto_tests/coverage.html b/auto_tests/coverage.html new file mode 100644 index 0000000..0457347 --- /dev/null +++ b/auto_tests/coverage.html @@ -0,0 +1,66 @@ + + + + dygraphs tests + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/auto_tests/karma.conf.js b/auto_tests/karma.conf.js deleted file mode 100644 index 09d0596..0000000 --- a/auto_tests/karma.conf.js +++ /dev/null @@ -1,38 +0,0 @@ -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' - ] - }); -}; diff --git a/auto_tests/runner.html b/auto_tests/runner.html new file mode 100644 index 0000000..c3a3d87 --- /dev/null +++ b/auto_tests/runner.html @@ -0,0 +1,66 @@ + + + + dygraphs tests + + + +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/auto_tests/tests/CanvasAssertions.js b/auto_tests/tests/CanvasAssertions.js index 2b37ec5..ef37fb9 100644 --- a/auto_tests/tests/CanvasAssertions.js +++ b/auto_tests/tests/CanvasAssertions.js @@ -244,3 +244,5 @@ CanvasAssertions.match = function(predicate, call) { } return true; }; + +export default CanvasAssertions; diff --git a/auto_tests/tests/DygraphOps.js b/auto_tests/tests/DygraphOps.js index 52f5943..460547b 100644 --- a/auto_tests/tests/DygraphOps.js +++ b/auto_tests/tests/DygraphOps.js @@ -18,6 +18,7 @@ // 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. @@ -109,7 +110,7 @@ DygraphOps.dispatchDoubleClick = function(g, custom) { * 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; @@ -213,3 +214,5 @@ DygraphOps.dispatchMouseOut = function(g, x, y, custom) { custom); }; + +export default DygraphOps; diff --git a/auto_tests/tests/PixelSampler.js b/auto_tests/tests/PixelSampler.js index e1b3be3..d45ab8a 100644 --- a/auto_tests/tests/PixelSampler.js +++ b/auto_tests/tests/PixelSampler.js @@ -33,6 +33,17 @@ PixelSampler.prototype.colorAtPixel = function(x, y) { }; /** + * 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.} 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. @@ -45,3 +56,5 @@ PixelSampler.prototype.colorAtCoordinate = function(x, y) { var dom_xy = this.dygraph_.toDomCoords(x, y); return this.colorAtPixel(Math.round(dom_xy[0]), Math.round(dom_xy[1])); }; + +export default PixelSampler; diff --git a/auto_tests/tests/Proxy.js b/auto_tests/tests/Proxy.js index 9ffc385..2348b87 100644 --- a/auto_tests/tests/Proxy.js +++ b/auto_tests/tests/Proxy.js @@ -75,3 +75,5 @@ Proxy.prototype.log__ = function(name, args) { Proxy.reset = function(proxy) { proxy.calls__ = []; } + +export default Proxy; diff --git a/auto_tests/tests/Util.js b/auto_tests/tests/Util.js index 3b8c1b8..36532cd 100644 --- a/auto_tests/tests/Util.js +++ b/auto_tests/tests/Util.js @@ -3,6 +3,9 @@ * * @author konigsberg@google.com (Robert Konigsberg) */ + +import * as utils from '../../src/dygraph-utils'; + var Util = {}; /** @@ -90,14 +93,14 @@ Util.makeNumbers = function(ary) { /** * 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; @@ -145,7 +148,7 @@ Util.overrideXMLHttpRequest = function(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 }; /** @@ -168,3 +171,5 @@ Util.captureConsole = function(obj) { console.error = orig[2]; }; }; + +export default Util; diff --git a/auto_tests/tests/annotations.js b/auto_tests/tests/annotations.js index 3ea5e7c..3be1936 100644 --- a/auto_tests/tests/annotations.js +++ b/auto_tests/tests/annotations.js @@ -3,14 +3,13 @@ * * @author danvk@google.com (Dan Vanderkam) */ -describe("annotations", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +import Dygraph from '../../src/dygraph'; +import Util from './Util'; -afterEach(function() { -}); +describe("annotations", function() { + +cleanupAfterEach(); it('testAnnotationsDrawn', function() { var opts = { diff --git a/auto_tests/tests/axis_labels-deprecated.js b/auto_tests/tests/axis_labels-deprecated.js deleted file mode 100644 index 6ca1dc1..0000000 --- a/auto_tests/tests/axis_labels-deprecated.js +++ /dev/null @@ -1,318 +0,0 @@ -/** - * @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 = "
"; -}); - -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()); -}); - -}); diff --git a/auto_tests/tests/axis_labels.js b/auto_tests/tests/axis_labels.js index abff8b2..0af8085 100644 --- a/auto_tests/tests/axis_labels.js +++ b/auto_tests/tests/axis_labels.js @@ -3,14 +3,16 @@ * * @author dan@dygraphs.com (Dan Vanderkam) */ -describe("axis-labels", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +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" + @@ -204,7 +206,7 @@ it('testDateAxisLabelFormatter', function() { 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()); @@ -705,7 +707,7 @@ it('testAxisLabelFontSize', function() { 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); @@ -763,7 +765,7 @@ it('testAxisLabelFontSizeNull', function() { }; // 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"); @@ -774,7 +776,7 @@ it('testAxisLabelColor', function() { 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); @@ -832,7 +834,7 @@ it('testAxisLabelColorNull', function() { } // 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)"); diff --git a/auto_tests/tests/callback.js b/auto_tests/tests/callback.js index b12ea64..1e00815 100644 --- a/auto_tests/tests/callback.js +++ b/auto_tests/tests/callback.js @@ -4,12 +4,22 @@ * @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 = "
"; + var container = document.getElementById('graph'); + container.innerHTML = "
"; + graph = container.querySelector('#inner-graph'); xhr = XMLHttpRequest; styleSheet = document.createElement("style"); styleSheet.type = "text/css"; @@ -42,7 +52,6 @@ it('testHighlightCallbackIsCalled', function() { h_pts = pts; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { width: 100, @@ -71,7 +80,6 @@ it('testDrawPointCallback_disabled', function() { called = true; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { drawPointCallback: callback, }); @@ -91,7 +99,6 @@ it('testDrawPointCallback_enabled', function() { called = true; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { drawPoints: true, drawPointCallback: callback @@ -114,7 +121,6 @@ it('testDrawPointCallback_pointSize', function() { count++; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { drawPoints: true, drawPointCallback: callback @@ -144,10 +150,9 @@ it('testDrawPointCallback_isolated', function() { 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'], @@ -188,7 +193,6 @@ it('testDrawHighlightPointCallbackIsCalled', function() { called = true; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { width: 100, @@ -211,7 +215,6 @@ var runClosestTest = function(isStacked, widthNormal, widthHighlighted) { var h_pts; var h_series; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { width: 600, @@ -359,7 +362,6 @@ it('testNaNData', function() { h_pts = pts; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, dataNaN, { width: 600, @@ -412,7 +414,6 @@ it('testNaNDataStack', function() { h_pts = pts; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, dataNaN, { width: 600, @@ -478,7 +479,6 @@ it('testGapHighlight', function() { h_pts = pts; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, dataGap, { width: 400, height: 300, @@ -521,7 +521,6 @@ it('testFailedResponse', function() { 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, @@ -551,7 +550,6 @@ it('testHighlightCallbackRow', function() { highlightRow = row; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, "X,Y,Z\n" + "0,1,2\n" + // 0 @@ -602,7 +600,6 @@ it('testUnderlayCallback_noSeries', function() { yMax = g.yAxisRange(0)[1]; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, "\n", { underlayCallback: callback }); @@ -625,7 +622,6 @@ it('testUnderlayCallback_yAxisRange', function() { yMax = g.yAxisRange(0)[1]; }; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, "\n", { valueRange: [0,10], underlayCallback: callback @@ -645,10 +641,9 @@ it('testDrawPointCallback_idx', function() { 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 = { @@ -695,7 +690,6 @@ it('testDrawHighlightPointCallback_idx', function() { 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'] diff --git a/auto_tests/tests/connect_separated_points.js b/auto_tests/tests/connect_separated_points.js index 2636b41..7b9fe4c 100644 --- a/auto_tests/tests/connect_separated_points.js +++ b/auto_tests/tests/connect_separated_points.js @@ -3,17 +3,20 @@ * * @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 = "
"; -}); +cleanupAfterEach(); -var origFunc = Dygraph.getContext; +var origFunc = utils.getContext; beforeEach(function() { - document.body.innerHTML = "
"; - Dygraph.getContext = function(canvas) { + utils.getContext = function(canvas) { return new Proxy(origFunc(canvas)); }; }); diff --git a/auto_tests/tests/css.js b/auto_tests/tests/css.js index 89a0680..b1c96de 100644 --- a/auto_tests/tests/css.js +++ b/auto_tests/tests/css.js @@ -4,20 +4,25 @@ * @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 = "
"; 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. @@ -78,12 +83,13 @@ it('testPixelStyleWins', function() { // Verifies that a CSS percentage size works. it('testPercentageSize', function() { - document.body.innerHTML = + var testdiv = document.getElementById("graph"); + testdiv.innerHTML = '
' + - '
'; + '
'; var opts = { }; - var graph = document.getElementById("graph"); + var graph = document.getElementById("inner-graph"); graph.style.width = '50%'; graph.style.height = '50%'; @@ -109,22 +115,20 @@ it('testClassPixelSize', function() { // An invisible chart div shouldn't produce an error. it('testInvisibleChart', function() { - document.body.innerHTML = + graph.innerHTML = '
' + - '
' + + '
' + '
'; - 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 = '
' + - '
' + + '
' + '
'; - 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" + @@ -137,11 +141,12 @@ it('testInvisibleChartDate', function() { // An invisible chart div that becomes visible. it('testInvisibleThenVisibleChart', function() { - document.body.innerHTML = + var testdiv = document.getElementById("graph"); + testdiv.innerHTML = ''; - var graph = document.getElementById("graph"); + var graph = document.getElementById("inner-graph"); var g = new Dygraph(graph, "Date,Y\n" + "2010/01/01,100\n" + diff --git a/auto_tests/tests/custom_asserts.js b/auto_tests/tests/custom_asserts.js index 06e2444..9391f89 100644 --- a/auto_tests/tests/custom_asserts.js +++ b/auto_tests/tests/custom_asserts.js @@ -2,7 +2,7 @@ * @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++) { diff --git a/auto_tests/tests/custom_bars.js b/auto_tests/tests/custom_bars.js index cbffe7e..ebc867a 100644 --- a/auto_tests/tests/custom_bars.js +++ b/auto_tests/tests/custom_bars.js @@ -4,18 +4,25 @@ * @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 = "
"; - 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. diff --git a/auto_tests/tests/data_api.js b/auto_tests/tests/data_api.js index 4b0ebe0..e692fc6 100644 --- a/auto_tests/tests/data_api.js +++ b/auto_tests/tests/data_api.js @@ -3,12 +3,14 @@ * * @author danvdk@gmail.com (Dan Vanderkam) */ +import Dygraph from '../../src/dygraph'; describe("data-api", function() { +cleanupAfterEach(); + var opts, graphDiv; beforeEach(function() { - document.body.innerHTML = "
"; opts = { width: 480, height: 320 @@ -17,9 +19,6 @@ beforeEach(function() { graphDiv = document.getElementById("graph"); }); -afterEach(function() { -}); - it('testBasicAccessors', function() { var g = new Dygraph(graphDiv, temperature_data, opts); diff --git a/auto_tests/tests/date_formats.js b/auto_tests/tests/date_formats.js index d15567b..f157b8d 100644 --- a/auto_tests/tests/date_formats.js +++ b/auto_tests/tests/date_formats.js @@ -3,13 +3,10 @@ * * @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 @@ -19,7 +16,7 @@ it('testISO8601', function() { // 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")); } }); @@ -36,7 +33,7 @@ it('testHyphenatedDate', function() { 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)); }); }); diff --git a/auto_tests/tests/date_ticker.js b/auto_tests/tests/date_ticker.js index 554105b..c02331d 100644 --- a/auto_tests/tests/date_ticker.js +++ b/auto_tests/tests/date_ticker.js @@ -6,22 +6,23 @@ * @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 = "
"; -}); +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; @@ -41,7 +42,7 @@ it('testBasicDateTicker', function() { 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"}, @@ -57,8 +58,8 @@ it('testBasicDateTicker', function() { 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'}, @@ -86,7 +87,7 @@ it('testAllDateTickers', function() { // 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; }; diff --git a/auto_tests/tests/dygraph-options-tests.js b/auto_tests/tests/dygraph-options-tests.js index 4311fb5..ded9ee3 100644 --- a/auto_tests/tests/dygraph-options-tests.js +++ b/auto_tests/tests/dygraph-options-tests.js @@ -1,18 +1,21 @@ /** * @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 = "
"; graph = document.getElementById("graph"); }); -afterEach(function() { -}); - /* * Pathalogical test to ensure getSeriesNames works */ @@ -74,7 +77,7 @@ var getWarnings = function(div, data, opts) { }; it('testLogWarningForNonexistentOption', function() { - if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') { + if (!OPTIONS_REFERENCE) { return; // this test won't pass in non-debug mode. } @@ -103,7 +106,7 @@ it('testLogWarningForNonexistentOption', function() { }); it('testOnlyLogsEachWarningOnce', function() { - if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') { + if (!OPTIONS_REFERENCE) { return; // this test won't pass in non-debug mode. } diff --git a/auto_tests/tests/error_bars.js b/auto_tests/tests/error_bars.js index e04acde..4fd3369 100644 --- a/auto_tests/tests/error_bars.js +++ b/auto_tests/tests/error_bars.js @@ -3,23 +3,17 @@ * * @author danvk@google.com (Dan Vanderkam) */ -describe("error-bars", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +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 = "
"; - 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 = { diff --git a/auto_tests/tests/fast_canvas_proxy.js b/auto_tests/tests/fast_canvas_proxy.js index 5d3322b..217dbd6 100644 --- a/auto_tests/tests/fast_canvas_proxy.js +++ b/auto_tests/tests/fast_canvas_proxy.js @@ -3,13 +3,11 @@ * * @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() {}, diff --git a/auto_tests/tests/fill_step_plot.js b/auto_tests/tests/fill_step_plot.js index 6406016..1c43145 100644 --- a/auto_tests/tests/fill_step_plot.js +++ b/auto_tests/tests/fill_step_plot.js @@ -4,23 +4,25 @@ * * @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 = "
"; -}); +cleanupAfterEach(); -var origFunc = Dygraph.getContext; +var origFunc = utils.getContext; beforeEach(function() { - document.body.innerHTML = "
"; - Dygraph.getContext = function(canvas) { + utils.getContext = function(canvas) { return new Proxy(origFunc(canvas)); }; }); afterEach(function() { - Dygraph.getContext = origFunc; + utils.getContext = origFunc; }); diff --git a/auto_tests/tests/formats.js b/auto_tests/tests/formats.js index a0b779b..f16cc6d 100644 --- a/auto_tests/tests/formats.js +++ b/auto_tests/tests/formats.js @@ -3,14 +3,12 @@ * * @author konigsberg@google.com (Robert Konigsberg) */ -describe("formats", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +import Dygraph from '../../src/dygraph'; -afterEach(function() { -}); +describe("formats", function() { + +cleanupAfterEach(); var dataString = "X,Y\n" + diff --git a/auto_tests/tests/grid_per_axis.js b/auto_tests/tests/grid_per_axis.js index 6ca239c..3a4c475 100644 --- a/auto_tests/tests/grid_per_axis.js +++ b/auto_tests/tests/grid_per_axis.js @@ -4,24 +4,19 @@ * * @author david.eberlein@ch.sauter-bc.com (Fr. Sauter AG) */ -describe("grid-per-axis", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +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 = "
"; - 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 = { @@ -130,17 +125,19 @@ it('testPerAxisGridColors', function() { } 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, @@ -192,6 +189,8 @@ it('testPerAxisGridWidth', function() { } 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 @@ -200,11 +199,11 @@ it('testPerAxisGridWidth', function() { // 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 @@ -227,26 +226,30 @@ it('testPerAxisGridWidth', function() { 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" ], @@ -287,6 +290,7 @@ it('testGridLinePattern', function() { 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)); @@ -295,9 +299,11 @@ it('testGridLinePattern', function() { // 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 @@ -312,5 +318,6 @@ it('testGridLinePattern', function() { } } }); +} }); diff --git a/auto_tests/tests/gviz.js b/auto_tests/tests/gviz.js index c663029..735e6f8 100644 --- a/auto_tests/tests/gviz.js +++ b/auto_tests/tests/gviz.js @@ -2,14 +2,13 @@ * Unit tests for GViz data table support. */ -describe('gviz', function() { +import Dygraph from '../../src/dygraph'; - beforeEach(function() { - document.body.innerHTML = "
"; - }); +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. diff --git a/auto_tests/tests/hidpi.js b/auto_tests/tests/hidpi.js index cdf0ee4..1dd131c 100644 --- a/auto_tests/tests/hidpi.js +++ b/auto_tests/tests/hidpi.js @@ -3,14 +3,17 @@ * * @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 = "
"; }); afterEach(function() { diff --git a/auto_tests/tests/interaction_model.js b/auto_tests/tests/interaction_model.js index 3d6e3d0..a846df5 100644 --- a/auto_tests/tests/interaction_model.js +++ b/auto_tests/tests/interaction_model.js @@ -3,14 +3,14 @@ * * @author konigsberg@google.com (Robert Konigsbrg) */ -describe("interaction-model", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +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" + @@ -100,15 +100,15 @@ it('testClickCallbackIsCalledOnCustomPan', function() { 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 = { @@ -153,7 +153,7 @@ it('testClickCallbackIsCalledWithNonInteractiveModel', function() { width: 100, height : 100, clickCallback : clickCallback, - interactionModel : Dygraph.Interaction.nonInteractiveModel_ + interactionModel : DygraphInteraction.nonInteractiveModel_ }; var graph = document.getElementById("graph"); diff --git a/auto_tests/tests/missing_points.js b/auto_tests/tests/missing_points.js index 48ef26d..dce01ed 100644 --- a/auto_tests/tests/missing_points.js +++ b/auto_tests/tests/missing_points.js @@ -23,21 +23,19 @@ * * @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 = "
"; - 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"); diff --git a/auto_tests/tests/multi_csv.js b/auto_tests/tests/multi_csv.js index c6b8d4f..99008e2 100644 --- a/auto_tests/tests/multi_csv.js +++ b/auto_tests/tests/multi_csv.js @@ -3,14 +3,12 @@ * * @author dan@dygraphs.com (Dan Vanderkam) */ -describe("multi-csv", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +import Dygraph from '../../src/dygraph'; -afterEach(function() { -}); +describe("multi-csv", function() { + +cleanupAfterEach(); function getXLabels() { var x_labels = document.getElementsByClassName("dygraph-axis-label-x"); diff --git a/auto_tests/tests/multiple_axes.js b/auto_tests/tests/multiple_axes.js index 3935b52..68c62a5 100644 --- a/auto_tests/tests/multiple_axes.js +++ b/auto_tests/tests/multiple_axes.js @@ -4,11 +4,13 @@ * @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 = "
"; -}); +cleanupAfterEach(); var getData = function() { var data = []; @@ -220,12 +222,12 @@ it('testDrawPointCallback', function() { 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( diff --git a/auto_tests/tests/no_hours.js b/auto_tests/tests/no_hours.js index 323c84e..bcfc1fe 100644 --- a/auto_tests/tests/no_hours.js +++ b/auto_tests/tests/no_hours.js @@ -5,14 +5,13 @@ * * @author danvk@google.com (Dan Vanderkam) */ -describe("no-hours", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +import Dygraph from '../../src/dygraph'; +import Util from './Util'; -afterEach(function() { -}); +describe("no-hours", function() { + +cleanupAfterEach(); it('testNoHours', function() { var opts = { diff --git a/auto_tests/tests/numeric_ticker.js b/auto_tests/tests/numeric_ticker.js index 27707d4..b3b4620 100644 --- a/auto_tests/tests/numeric_ticker.js +++ b/auto_tests/tests/numeric_ticker.js @@ -6,22 +6,24 @@ * @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 = "
"; -}); +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; @@ -32,7 +34,7 @@ it('testBasicNumericTicker', function() { 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"}, @@ -47,7 +49,7 @@ it('testBasicNumericTicker', function() { {"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"}, diff --git a/auto_tests/tests/parser.js b/auto_tests/tests/parser.js index e74cbef..6634cd5 100644 --- a/auto_tests/tests/parser.js +++ b/auto_tests/tests/parser.js @@ -3,14 +3,13 @@ * * @author danvk@google.com (Dan Vanderkam) */ -describe("parser", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +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" + @@ -19,7 +18,7 @@ it('testDetectLineDelimiter', function() { "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" + @@ -27,7 +26,7 @@ it('testDetectLineDelimiter', function() { "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" + @@ -35,7 +34,7 @@ it('testDetectLineDelimiter', function() { "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() { diff --git a/auto_tests/tests/pathological_cases.js b/auto_tests/tests/pathological_cases.js index 297167c..0bcab0b 100644 --- a/auto_tests/tests/pathological_cases.js +++ b/auto_tests/tests/pathological_cases.js @@ -4,12 +4,17 @@ * * @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 = "
"; restoreConsole = Util.captureConsole(logs); }); @@ -17,6 +22,8 @@ afterEach(function() { restoreConsole(); }); +var graph = document.getElementById("graph"); + it('testZeroPoint', function() { var opts = { width: 480, @@ -24,7 +31,6 @@ it('testZeroPoint', function() { }; var data = "X,Y\n"; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); }); @@ -36,7 +42,6 @@ it('testOnePoint', function() { var data = "X,Y\n" + "1,2\n"; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); }); @@ -97,7 +102,7 @@ it('testCombinations', function() { 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]; @@ -109,7 +114,7 @@ it('testCombinations', function() { 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); @@ -139,7 +144,6 @@ it('testNullLegend', function() { var data = "X,Y\n" + "1,2\n"; - var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); }); diff --git a/auto_tests/tests/per_axis.js b/auto_tests/tests/per_axis.js index 4ae6208..d7f1a49 100644 --- a/auto_tests/tests/per_axis.js +++ b/auto_tests/tests/per_axis.js @@ -3,9 +3,18 @@ * * @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"; @@ -13,11 +22,6 @@ var yAxisLineColor = "#ffff00"; var g, graph; beforeEach(function() { - document.body.innerHTML = "
"; - Dygraph.getContext = function(canvas) { - return new Proxy(_origGetContext(canvas)); - } - var opts = { axes : { x : { @@ -42,10 +46,6 @@ beforeEach(function() { 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); diff --git a/auto_tests/tests/per_series.js b/auto_tests/tests/per_series.js index 07af084..f3ff16d 100644 --- a/auto_tests/tests/per_series.js +++ b/auto_tests/tests/per_series.js @@ -3,14 +3,14 @@ * * @author danvk@google.com (Dan Vanderkam) */ -describe("per-series", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +import Dygraph from '../../src/dygraph'; -afterEach(function() { -}); +import PixelSampler from './PixelSampler'; + +describe("per-series", function() { + +cleanupAfterEach(); it('testPerSeriesFill', function() { var opts = { diff --git a/auto_tests/tests/plugins.js b/auto_tests/tests/plugins.js index 1abccd4..f339656 100644 --- a/auto_tests/tests/plugins.js +++ b/auto_tests/tests/plugins.js @@ -3,13 +3,17 @@ * * @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 = "
"; - data = "X,Y1,Y2\n" + "0,1,2\n" + "1,2,1\n" + @@ -18,9 +22,6 @@ beforeEach(function() { ; }); -afterEach(function() { -}); - it('testWillDrawChart', function() { var draw = 0; diff --git a/auto_tests/tests/plugins_legend.js b/auto_tests/tests/plugins_legend.js index 124d929..26daf92 100644 --- a/auto_tests/tests/plugins_legend.js +++ b/auto_tests/tests/plugins_legend.js @@ -1,10 +1,16 @@ +import Dygraph from '../../src/dygraph'; +import LegendPlugin from '../../src/plugins/legend'; +import Util from './Util'; + describe("plugins-legend", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +var graph; -afterEach(function() { +cleanupAfterEach(); +beforeEach(function() { + var testDiv = document.getElementById('graph'); + testDiv.innerHTML = "
"; + graph = document.getElementById('inner-graph'); }); it('testLegendEscape', function() { @@ -19,10 +25,9 @@ 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', @@ -42,7 +47,7 @@ it('testLegendEscape', function() { 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)); @@ -50,14 +55,14 @@ null 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' diff --git a/auto_tests/tests/range_selector.js b/auto_tests/tests/range_selector.js index 584e054..82884c8 100644 --- a/auto_tests/tests/range_selector.js +++ b/auto_tests/tests/range_selector.js @@ -4,12 +4,23 @@ * @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 = "
"; restoreConsole = Util.captureConsole(logs); }); @@ -403,9 +414,9 @@ it('testRangeSelectorPositionIfXAxisNotDrawn', function() { 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); } @@ -435,7 +446,7 @@ it('testMiniPlotDrawn', function() { 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. @@ -452,7 +463,7 @@ it('testSingleCombinedSeries', function() { 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_(); @@ -482,7 +493,7 @@ it('testCombinedSeries', function() { 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_(); @@ -515,7 +526,7 @@ it('testSelectedCombinedSeries', function() { 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_(); @@ -545,7 +556,7 @@ it('testSingleCombinedSeriesCustomBars', function() { 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_(); @@ -574,7 +585,7 @@ it('testSingleCombinedSeriesErrorBars', function() { 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_(); @@ -604,7 +615,7 @@ it('testTwoCombinedSeriesCustomBars', function() { 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_(); diff --git a/auto_tests/tests/range_tests.js b/auto_tests/tests/range_tests.js index 1391a2a..ff1018e 100644 --- a/auto_tests/tests/range_tests.js +++ b/auto_tests/tests/range_tests.js @@ -24,6 +24,12 @@ * * @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 = []; @@ -42,9 +48,7 @@ var FIVE_TO_ONE_THOUSAND = [ describe("range-tests", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +cleanupAfterEach(); var createGraph = function(opts, data, expectRangeX, expectRangeY) { if (data === undefined) data = ZERO_TO_FIFTY_STEPS; diff --git a/auto_tests/tests/resize.js b/auto_tests/tests/resize.js index 9a8cffe..6230ffb 100644 --- a/auto_tests/tests/resize.js +++ b/auto_tests/tests/resize.js @@ -3,8 +3,16 @@ * * @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" + @@ -14,18 +22,9 @@ var data = "5,300\n" + "6,100\n"; -beforeEach(function() { - document.body.innerHTML = "
"; -}); - -afterEach(function() { -}); - it('testResizeMaintainsMouseOperations', function() { - document.body.innerHTML = - '
' + - ''; - var graph = document.getElementById("graph"); + var graph = document.getElementById('graph'); + graph.setAttribute('style', 'width: 640px; height: 480px;'); var callbackCount = 0; var callback = function() { @@ -46,7 +45,7 @@ it('testResizeMaintainsMouseOperations', function() { strum(g, 300, 640); assert.equal(6, callbackCount); - document.getElementById("graph").style.width = "500px"; + graph.style.width = "500px"; g.resize(); callbackCount = 0; diff --git a/auto_tests/tests/rolling_average.js b/auto_tests/tests/rolling_average.js index 5a16aa4..4b68da2 100644 --- a/auto_tests/tests/rolling_average.js +++ b/auto_tests/tests/rolling_average.js @@ -3,14 +3,14 @@ * * @author danvk@google.com (Dan Vanderkam) */ -describe("rolling-average", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +import Dygraph from '../../src/dygraph'; -afterEach(function() { -}); +import Util from './Util'; + +describe("rolling-average", function() { + +cleanupAfterEach(); it('testRollingAverage', function() { var opts = { diff --git a/auto_tests/tests/sanity.js b/auto_tests/tests/sanity.js index 0f3057c..e1d37ab 100644 --- a/auto_tests/tests/sanity.js +++ b/auto_tests/tests/sanity.js @@ -25,14 +25,14 @@ * @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 = "
"; -}); +cleanupAfterEach(); /** * The sanity test of sanity tests. diff --git a/auto_tests/tests/scientific_notation.js b/auto_tests/tests/scientific_notation.js index ebbf2ed..a502484 100644 --- a/auto_tests/tests/scientific_notation.js +++ b/auto_tests/tests/scientific_notation.js @@ -5,14 +5,13 @@ * * @author danvk@google.com (Dan Vanderkam) */ -describe("scientific-notation", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +import Dygraph from '../../src/dygraph'; +import {assertDeepCloseTo} from './custom_asserts'; -afterEach(function() { -}); +describe("scientific-notation", function() { + +cleanupAfterEach(); function getXValues(g) { var xs = []; diff --git a/auto_tests/tests/scrolling_div.js b/auto_tests/tests/scrolling_div.js index ce95a7e..c9dec0c 100644 --- a/auto_tests/tests/scrolling_div.js +++ b/auto_tests/tests/scrolling_div.js @@ -3,6 +3,10 @@ * * @author konigsberg@google.com (Robert Konigsbrg) */ + +import Dygraph from '../../src/dygraph'; +import DygraphOps from './DygraphOps'; + describe("scrolling-div", function() { var point, g; @@ -18,13 +22,19 @@ var LOREM_IPSUM = "non proident, sunt in culpa qui officia deserunt mollit anim id est\n" + "laborum.

"; - document.body.innerHTML = + var testDiv = document.getElementById('graph'); + testDiv.innerHTML = "
" + - "
" + + "
" + "
" + LOREM_IPSUM + "
" + "
" + LOREM_IPSUM + "
" + "
"; + // 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 ], @@ -35,7 +45,7 @@ var LOREM_IPSUM = [ 70, 4 ], [ 80, 6 ] ]; - var graph = document.getElementById("graph"); + var graph = document.getElementById("graph-inner"); point = null; g = new Dygraph(graph, data, @@ -74,9 +84,6 @@ var detectScrollbarWidth = function() { return scrollbarWidth; }; -afterEach(function() { -}); - /** * This tests that when the nested div is unscrolled, things work normally. */ diff --git a/auto_tests/tests/selection.js b/auto_tests/tests/selection.js index 02f1227..bb8e852 100644 --- a/auto_tests/tests/selection.js +++ b/auto_tests/tests/selection.js @@ -6,11 +6,12 @@ * @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 = "
"; -}); +cleanupAfterEach(); it('testSetGetSelection', function() { var graph = document.getElementById("graph"); @@ -51,7 +52,7 @@ it('testSetGetSelectionDense', function() { 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') { diff --git a/auto_tests/tests/simple_drawing.js b/auto_tests/tests/simple_drawing.js index bda0e84..2ef84f3 100644 --- a/auto_tests/tests/simple_drawing.js +++ b/auto_tests/tests/simple_drawing.js @@ -24,21 +24,19 @@ * @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 = "
"; - 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 = { diff --git a/auto_tests/tests/smooth_plotter.js b/auto_tests/tests/smooth_plotter.js index 41b0f5d..146e426 100644 --- a/auto_tests/tests/smooth_plotter.js +++ b/auto_tests/tests/smooth_plotter.js @@ -3,8 +3,13 @@ * * @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() { diff --git a/auto_tests/tests/stacked.js b/auto_tests/tests/stacked.js index 5e4c55c..3d997af 100644 --- a/auto_tests/tests/stacked.js +++ b/auto_tests/tests/stacked.js @@ -3,20 +3,18 @@ * * @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 = "
"; - 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 = { diff --git a/auto_tests/tests/step_plot_per_series.js b/auto_tests/tests/step_plot_per_series.js index a5ff5ee..805a65a 100644 --- a/auto_tests/tests/step_plot_per_series.js +++ b/auto_tests/tests/step_plot_per_series.js @@ -8,24 +8,17 @@ * * @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG) */ -describe("step-plot-per-series", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +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 = "
"; - 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 = { diff --git a/auto_tests/tests/synchronize.js b/auto_tests/tests/synchronize.js index 173b32f..fdc20dc 100644 --- a/auto_tests/tests/synchronize.js +++ b/auto_tests/tests/synchronize.js @@ -3,6 +3,12 @@ * * @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,9 +18,10 @@ describe("synchronize", function() { "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 = "
"; + graph.innerHTML = "
"; originalCallbackCalled = false; h_row = 0, h_pts = []; gs = []; diff --git a/auto_tests/tests/to_dom_coords.js b/auto_tests/tests/to_dom_coords.js index 5aa4520..4540501 100644 --- a/auto_tests/tests/to_dom_coords.js +++ b/auto_tests/tests/to_dom_coords.js @@ -3,20 +3,17 @@ * * @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 = "
"; - 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) { diff --git a/auto_tests/tests/two_digit_years.js b/auto_tests/tests/two_digit_years.js index 9e2d490..76241f8 100644 --- a/auto_tests/tests/two_digit_years.js +++ b/auto_tests/tests/two_digit_years.js @@ -3,6 +3,12 @@ * * @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() { @@ -16,8 +22,8 @@ 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: diff --git a/auto_tests/tests/update_options.js b/auto_tests/tests/update_options.js index d2465c9..e581110 100644 --- a/auto_tests/tests/update_options.js +++ b/auto_tests/tests/update_options.js @@ -4,7 +4,12 @@ * @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, @@ -18,13 +23,6 @@ var data = "X,Y1,Y2\n" + "2011-04-04,9,5\n" + "2011-05-05,8,3\n"; -beforeEach(function() { - document.body.innerHTML = "
"; -}); - -afterEach(function() { -}); - /* * Tweaks the dygraph so it sets g._testDrawCalled to true when internal method * drawGraph_ is called. Call unWrapDrawGraph when done with this. diff --git a/auto_tests/tests/update_while_panning.js b/auto_tests/tests/update_while_panning.js index ac01900..c810f1a 100644 --- a/auto_tests/tests/update_while_panning.js +++ b/auto_tests/tests/update_while_panning.js @@ -5,14 +5,13 @@ * * @author dan@dygraphs.com (Dan Vanderkam) */ -describe("update-while-panning", function() { -beforeEach(function() { - document.body.innerHTML = "
"; -}); +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) diff --git a/auto_tests/tests/utils_test.js b/auto_tests/tests/utils_test.js index e8ebe5a..6d96e26 100644 --- a/auto_tests/tests/utils_test.js +++ b/auto_tests/tests/utils_test.js @@ -4,6 +4,8 @@ * @author danvdk@gmail.com (Dan Vanderkam) */ +import * as utils from '../../src/dygraph-utils'; + describe("utils-tests", function() { it('testUpdate', function() { @@ -18,13 +20,13 @@ 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']); @@ -43,13 +45,13 @@ it('testUpdateDeep', function() { 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']); @@ -64,7 +66,7 @@ it('testUpdateDeepDecoupled', function() { }; var b = {}; - Dygraph.updateDeep(b, a); + utils.updateDeep(b, a); b.a = 2; assert.equal(1, a.a); @@ -79,7 +81,7 @@ it('testUpdateDeepDecoupled', function() { 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()); @@ -99,7 +101,7 @@ it('testIterator_nopredicate', function() { 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); @@ -117,13 +119,13 @@ it('testIterator_predicate', function() { 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); @@ -140,7 +142,7 @@ it('testIterator_outOfRange', function() { // 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"; @@ -160,7 +162,7 @@ it('testIterator_whole_array', function() { 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); @@ -172,15 +174,15 @@ it('testIterator_no_args', function() { }); 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' }}})); }); diff --git a/auto_tests/tests/visibility.js b/auto_tests/tests/visibility.js index 5f54639..1cc3764 100644 --- a/auto_tests/tests/visibility.js +++ b/auto_tests/tests/visibility.js @@ -3,14 +3,12 @@ * @author sergeyslepian@gmail.com */ -describe("visibility", function() { +import Dygraph from '../../src/dygraph'; +import Util from './Util'; -beforeEach(function() { - document.body.innerHTML = "
"; -}); +describe("visibility", function() { -afterEach(function() { -}); +cleanupAfterEach(); /** * Does a bunch of the shared busywork of setting up a graph and changing its visibility. diff --git a/bower.json b/bower.json index c7bffe2..6ebcc5c 100644 --- a/bower.json +++ b/bower.json @@ -1,13 +1,11 @@ { "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", @@ -31,6 +29,7 @@ "release.sh", "releases.json", "screenshot.png", + "scripts", "test.sh", "tests", "thumbnail.png" diff --git a/common/textarea.js b/common/textarea.js index b3a9590..ec79e0d 100644 --- a/common/textarea.js +++ b/common/textarea.js @@ -112,14 +112,14 @@ TextArea.prototype.show = function(title, content) { } } - 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"; diff --git a/dygraph-dev.js b/dygraph-dev.js deleted file mode 100644 index 506312e..0000000 --- a/dygraph-dev.js +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @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('\n'); - } -})(); diff --git a/experimental/palette/index.css b/experimental/palette/index.css deleted file mode 100644 index ca171f4..0000000 --- a/experimental/palette/index.css +++ /dev/null @@ -1,18 +0,0 @@ -@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; -} diff --git a/experimental/palette/index.html b/experimental/palette/index.html deleted file mode 100644 index de0cf0c..0000000 --- a/experimental/palette/index.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - Palette Demo - - - - - - - - - - - - -

Palette

-

To configure this chart, tweak the values on the right. - Enter applies changes, and the filter bar on the top reduces selections

- - - - - -
-
- -
-
-
-
- instructions - -
-
- - - diff --git a/experimental/palette/index.js b/experimental/palette/index.js deleted file mode 100644 index 924b139..0000000 --- a/experimental/palette/index.js +++ /dev/null @@ -1,138 +0,0 @@ -// 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); - } - } -} diff --git a/experimental/palette/jquery-1.8.3.min.js b/experimental/palette/jquery-1.8.3.min.js deleted file mode 100644 index 83589da..0000000 --- a/experimental/palette/jquery-1.8.3.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v1.8.3 jquery.com | jquery.org/license */ -(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").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(""),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)[^>]*$|#([\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(;a0)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(;s0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u-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
a",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>",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="
t
",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="
",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;i1,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.length1)},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=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=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=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=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=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=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;r0?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-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(;a1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a0,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(;r2&&(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(;ti.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="",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="",!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="
",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=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r",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="

",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="",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;t0)for(i=r;i=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-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=/]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*\s*$/g,Nt={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_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
","
"]),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>");try{for(;r1&&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;a0?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>"),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]===""&&!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>/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("
").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-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 diff --git a/experimental/palette/multi-palette.js b/experimental/palette/multi-palette.js deleted file mode 100644 index ee01a4c..0000000 --- a/experimental/palette/multi-palette.js +++ /dev/null @@ -1,252 +0,0 @@ -// 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 = $("
").addClass("palette").appendTo(parentElement); - var header = $("
").addClass("header").appendTo(this.root); - // Selector for series and axes. - var selectorRow = $("
").appendTo(header); - this.optionSelector = $("", { type : "search" }) - .keyup(filter) - .click(filter); - - header.append($("
") - .append($("").text("Filter:")) - .append($("").append(this.filterBar)) - .append($("") - .append($("") - .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($("") - .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]); - } - } - } -} diff --git a/experimental/palette/options.js b/experimental/palette/options.js deleted file mode 100644 index 1a3b231..0000000 --- a/experimental/palette/options.js +++ /dev/null @@ -1,347 +0,0 @@ -// 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|array|array|array - * 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" - }, - colorValue : { - type : "float" - }, - connectSeparatedPoints : { - type : "boolean" - }, - customBars : { - type : "boolean" - }, - dateWindow : { - type : "array" - }, - 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" - }, - 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", - 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" - }, - visibility : { - type : "array" - }, - 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)" - } -}; - diff --git a/experimental/palette/palette.css b/experimental/palette/palette.css deleted file mode 100644 index ea262e9..0000000 --- a/experimental/palette/palette.css +++ /dev/null @@ -1,50 +0,0 @@ -.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; -} diff --git a/experimental/palette/palette.js b/experimental/palette/palette.js deleted file mode 100644 index 514463f..0000000 --- a/experimental/palette/palette.js +++ /dev/null @@ -1,269 +0,0 @@ -// 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 = $("
") - .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 = $("