modules/http: rename dygraph-combined.js to dygraph.min.js to match upstream

Since dygraph version 2.0.0, upstream dygraph has been calling their
shipped files dygraph.min.js (see http://dygraphs.com/download.html).

Use the standard upstream name.

diff --git a/modules/http/http.lua.in b/modules/http/http.lua.in
index d36d83e75ace4f8096850061859b095b7d61b2ad..86736be32e718bf158c2b915b851cbd172eb4ca0 100644 (file)
--- a/modules/http/http.lua.in
+++ b/modules/http/http.lua.in
@@ -54,7 +54,7 @@ local pages = {
        'd3.js',
        'topojson.js',
        'datamaps.world.min.js',
-       'dygraph-combined.js',
+       'dygraph.min.js',
        'selectize.min.js',
        'selectize.min.css',
        'selectize.bootstrap3.min.css',

diff --git a/modules/http/static/dygraph-combined.js b/modules/http/static/dygraph.min.js
similarity index 100%
rename from modules/http/static/dygraph-combined.js
rename to modules/http/static/dygraph.min.js

diff --git a/modules/http/static/main.tpl b/modules/http/static/main.tpl
index e4eebbd3c8c2193625a88606fe1e9b04e4d87ee9..d05522cb5a90189517ed46abb373445afa53e5ac 100644 (file)
--- a/modules/http/static/main.tpl
+++ b/modules/http/static/main.tpl
@@ -9,7 +9,7 @@
 <script src="jquery.js"></script>
 <script src="bootstrap.min.js"></script>
 <script src="d3.js"></script>
-<script src="dygraph-combined.js"></script>
+<script src="dygraph.min.js"></script>
 <script src="selectize.min.js"></script>
 <script src="topojson.js"></script>
 <script src="datamaps.world.min.js"></script>