Merge pull request #296 from danvk/xlog

[dygraphs.git] / dygraph-dev.js

diff --git a/dygraph-dev.js b/dygraph-dev.js
index 709d0f7..6adfa51 100644 (file)
--- a/dygraph-dev.js
+++ b/dygraph-dev.js
@@ -1,3 +1,9 @@
+/**
+ * @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
@@ -6,25 +12,39 @@
 (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
-    var source_files = [
-      "strftime/strftime-min.js",
-      "rgbcolor/rgbcolor.js",
-      "dygraph-layout.js",
-      "dygraph-canvas.js",
-      "dygraph.js",
-      "dygraph-gviz.js",
-      "dygraph-debug.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 = [
+    "stacktrace.js",
+    "dashed-canvas.js",
+    "dygraph-options.js",
+    "dygraph-layout.js",
+    "dygraph-canvas.js",
+    "dygraph.js",
+    "dygraph-utils.js",
+    "dygraph-gviz.js",
+    "dygraph-interaction-model.js",
+    "dygraph-tickers.js",
+    "dygraph-plugin-base.js",
+    "plugins/annotations.js",
+    "plugins/axes.js",
+    "plugins/chart-labels.js",
+    "plugins/grid.js",
+    "plugins/legend.js",
+    "plugins/range-selector.js",
+    "dygraph-plugin-install.js",
+    "dygraph-options-reference.js",  // Shouldn't be included in generate-combined.sh
+    "datahandler/datahandler.js",
+    "datahandler/default.js",
+    "datahandler/default-fractions.js",
+    "datahandler/bars.js",
+    "datahandler/bars-error.js",
+    "datahandler/bars-custom.js",
+    "datahandler/bars-fractions.js"
+  ];
 
-    for (var i = 0; i < source_files.length; i++) {
-      document.write('<script type="text/javascript" src="' + path + '/' + source_files[i] + '"></script>\n');
-    }
+  for (var i = 0; i < source_files.length; i++) {
+    document.write('<script type="text/javascript" src="' + script.replace('dygraph-dev.js', source_files[i]) + '"></script>\n');
   }
 })();