From 7cc65f8ab23ff40c03994be3e5e57cd279b3f1f6 Mon Sep 17 00:00:00 2001 From: Sander Hoentjen Date: Wed, 13 Jan 2016 16:23:41 +0100 Subject: [PATCH] Add src JS files The reason for this is to make downstreams like Fedora happy. This makes checking those files for changes against upstream for example easier. In the progress I updated the js-libraries so I know which versions are used for both src and minified version. This is noted in the file src_js/SOURCES Also I deleted jsrender.js and purl.js because the were unused. Finally I added a Makefile option to build the minified js files yourself if you want to do so. --- pdns/dnsdistdist/Makefile.am | 8 + pdns/dnsdistdist/html/index.html | 7 +- pdns/dnsdistdist/html/js/d3.min.js | 5 + pdns/dnsdistdist/html/js/d3.v3.js | 5 - pdns/dnsdistdist/html/js/jquery-1.8.3.min.js | 2 - pdns/dnsdistdist/html/js/jquery.min.js | 5 + pdns/dnsdistdist/html/js/jsrender.js | 1283 -- pdns/dnsdistdist/html/js/moment.min.js | 6 +- pdns/dnsdistdist/html/js/purl.js | 267 - pdns/dnsdistdist/html/js/rickshaw.min.js | 6 +- pdns/dnsdistdist/html/js/underscore-min.js | 1 - pdns/dnsdistdist/src_js/SOURCES | 4 + pdns/dnsdistdist/src_js/d3.js | 9553 ++++++++++++++ pdns/dnsdistdist/src_js/jquery.js | 11027 +++++++++++++++++ pdns/dnsdistdist/src_js/moment.js | 3606 ++++++ pdns/dnsdistdist/src_js/rickshaw.js | 4068 ++++++ 16 files changed, 28285 insertions(+), 1568 deletions(-) create mode 100644 pdns/dnsdistdist/html/js/d3.min.js delete mode 100644 pdns/dnsdistdist/html/js/d3.v3.js delete mode 100644 pdns/dnsdistdist/html/js/jquery-1.8.3.min.js create mode 100644 pdns/dnsdistdist/html/js/jquery.min.js delete mode 100644 pdns/dnsdistdist/html/js/jsrender.js delete mode 100644 pdns/dnsdistdist/html/js/purl.js delete mode 100644 pdns/dnsdistdist/html/js/underscore-min.js create mode 100644 pdns/dnsdistdist/src_js/SOURCES create mode 100644 pdns/dnsdistdist/src_js/d3.js create mode 100644 pdns/dnsdistdist/src_js/jquery.js create mode 100644 pdns/dnsdistdist/src_js/moment.js create mode 100644 pdns/dnsdistdist/src_js/rickshaw.js diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index 665aa8da3e..3241086894 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -12,6 +12,14 @@ BUILT_SOURCES=htmlfiles.h htmlfiles.h: html/* ./incfiles > $@ +SRC_JS_FILES := $(wildcard src_js/*.js) +MIN_JS_FILES := $(patsubst src_js/%.js,html/js/%.min.js,$(SRC_JS_FILES)) + +html/js/%.min.js: src_js/%.js + uglifyjs $< > $@ + +min_js: $(MIN_JS_FILES) + EXTRA_DIST=dnslabeltext.rl \ dnsdistconf.lua \ README.md \ diff --git a/pdns/dnsdistdist/html/index.html b/pdns/dnsdistdist/html/index.html index 547038c963..135808ee0b 100644 --- a/pdns/dnsdistdist/html/index.html +++ b/pdns/dnsdistdist/html/index.html @@ -1,10 +1,9 @@ - - - - + + +