From: Dan Vanderkam Date: Mon, 25 Jul 2011 22:39:04 +0000 (-0400) Subject: merge X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=4a2c5cf034d87047f73732cf993aa10de27cf295;p=dygraphs.git merge --- 4a2c5cf034d87047f73732cf993aa10de27cf295 diff --cc auto_tests/misc/local.html index c71b4af,881c10f..02bce45 --- a/auto_tests/misc/local.html +++ b/auto_tests/misc/local.html @@@ -23,7 -23,41 +23,43 @@@ + + + + ++>>>>>>> master

diff --cc dygraph-dev.js index e572dba,34378ac..16a6955 --- a/dygraph-dev.js +++ b/dygraph-dev.js @@@ -6,29 -6,22 +6,23 @@@ (function() { var src=document.getElementsByTagName('script'); var script = src[src.length-1].getAttribute("src"); - var m = /^(.*)\/[^/]*\.js$/.exec(script); - if (!m) { - console.error("Can't grok dygraph-dev.js path: " + script); - } else { - var path = m[1]; // captured group, not the full match. - // This list needs to be kept in sync w/ the one in generate-combined.sh - // and the one in jsTestDriver.conf. - var source_files = [ - "strftime/strftime-min.js", - "rgbcolor/rgbcolor.js", - "dygraph-layout.js", - "dygraph-canvas.js", - "dygraph.js", - "dygraph-utils.js", - "dygraph-gviz.js", - "dygraph-interaction-model.js", - "dygraph-options-reference.js" // Shouldn't be included in generate-combined.sh - ]; + // This list needs to be kept in sync w/ the one in generate-combined.sh + // and the one in jsTestDriver.conf. + var source_files = [ + "strftime/strftime-min.js", + "rgbcolor/rgbcolor.js", + "dygraph-layout.js", + "dygraph-canvas.js", + "dygraph.js", + "dygraph-utils.js", + "dygraph-gviz.js", + "dygraph-interaction-model.js", + "dygraph-options-reference.js" // Shouldn't be included in generate-combined.sh + , "dygraph-tickers.js" + ]; - for (var i = 0; i < source_files.length; i++) { - document.write('\n'); - } + for (var i = 0; i < source_files.length; i++) { + document.write('\n'); } })();