X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-dev.js;h=34378ac7d1f26697943c6edd613f8a0c75b2fe95;hb=0cb9bd91af9cf5f15d8f27c17835e9bc82bab661;hp=a878e472e90aee050a8930ff42af8d63364c88b1;hpb=730852d89a91bfdf890cea16d572a2110068cb92;p=dygraphs.git

diff --git a/dygraph-dev.js b/dygraph-dev.js
index a878e47..34378ac 100644
--- a/dygraph-dev.js
+++ b/dygraph-dev.js
@@ -6,25 +6,22 @@
 (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-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
+  ];
 
-    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');
   }
 })();