summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--public-src/3rd-party/package.json4
-rw-r--r--public-src/3rd-party/yarn.lock8
-rwxr-xr-xpublic-src/index.html.gen2
-rw-r--r--public-src/require.config.js3
5 files changed, 13 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 6d44c88..f71d600 100644
--- a/Makefile
+++ b/Makefile
@@ -64,16 +64,10 @@ public-src/3rd-party/yarn.LICENSES.txt: bin/yarn-bower public-src/3rd-party/pack
public/3rd-party: public-src/3rd-party/yarn.LICENSES.txt
jquery-ver=1.6.3
-flot-ver=0.8.3
jsrrd-ver=1.1.1
jquerytools-ver=8ac4636a01d3860f1c4726ba722190a531bf1068
jarmon-dependencies: public-src/jarmon-dependencies/jquery-$(jquery-ver).js
-jarmon-dependencies: public-src/jarmon-dependencies/flot-$(flot-ver)/excanvas.js
-jarmon-dependencies: public-src/jarmon-dependencies/flot-$(flot-ver)/jquery.flot.js
-jarmon-dependencies: public-src/jarmon-dependencies/flot-$(flot-ver)/jquery.flot.time.js
-jarmon-dependencies: public-src/jarmon-dependencies/flot-$(flot-ver)/jquery.flot.stack.js
-jarmon-dependencies: public-src/jarmon-dependencies/flot-$(flot-ver)/jquery.flot.selection.js
jarmon-dependencies: public-src/jarmon-dependencies/javascriptrrd-$(jsrrd-ver)/rrdFile.js
jarmon-dependencies: public-src/jarmon-dependencies/javascriptrrd-$(jsrrd-ver)/binaryXHR.js
jarmon-dependencies: public-src/jarmon-dependencies/jquerytools-$(jquerytools-ver)/tabs.js
@@ -82,12 +76,6 @@ jarmon-dependencies: public-src/jarmon-dependencies/jquerytools-$(jquerytools-ve
public-src/jarmon-dependencies/jquery-%.js:
@mkdir -p '$(@D)'
wget -O $@ 'http://code.jquery.com/jquery-$*.js'
-public-src/jarmon-dependencies/flot-%.tar.gz:
- @mkdir -p '$(@D)'
- wget -O $@ 'https://github.com/flot/flot/archive/v$*.tar.gz'
-public-src/jarmon-dependencies/flot-$(flot-ver)/%: public-src/jarmon-dependencies/flot-$(flot-ver).tar.gz
- @mkdir -p '$(@D)'
- bsdtar -xOf $< flot-$(flot-ver)/$* > $@
public-src/jarmon-dependencies/javascriptrrd-$(jsrrd-ver)/%:
@mkdir -p '$(@D)'
wget -O $@ 'https://git.lukeshu.com/2git/javascriptrrd/plain/src/lib/$*?id=v$(jsrrd-ver)'
diff --git a/public-src/3rd-party/package.json b/public-src/3rd-party/package.json
index d3ea028..78d3f03 100644
--- a/public-src/3rd-party/package.json
+++ b/public-src/3rd-party/package.json
@@ -1,5 +1,7 @@
{
"dependencies": {
- "requirejs": "^2.3.5"
+ "flot": "git://github.com/flot/flot#v0.8.3",
+ "requirejs": "^2.3.5",
+ "sorttable": "git://github.com/stuartlangridge/sorttable"
}
}
diff --git a/public-src/3rd-party/yarn.lock b/public-src/3rd-party/yarn.lock
index 96c4650..d71257a 100644
--- a/public-src/3rd-party/yarn.lock
+++ b/public-src/3rd-party/yarn.lock
@@ -2,6 +2,14 @@
# yarn lockfile v1
+"flot@git://github.com/flot/flot#v0.8.3":
+ version "0.8.3"
+ resolved "git://github.com/flot/flot#453b017cc5acfd75e252b93e8635f57f4196d45d"
+
requirejs@^2.3.5:
version "2.3.5"
resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
+
+"sorttable@git://github.com/stuartlangridge/sorttable":
+ version "2.0.0"
+ resolved "git://github.com/stuartlangridge/sorttable#f0840b1f3c7a0f60983f0c6ddc1c4b1372b98b16"
diff --git a/public-src/index.html.gen b/public-src/index.html.gen
index 2930594..63fc1a6 100755
--- a/public-src/index.html.gen
+++ b/public-src/index.html.gen
@@ -15,7 +15,7 @@ echo '<!DOCTYPE html>
<title>Dashboard</title>
<!-- Scripts: DHTML (run before DOMContentLoaded) -->
- <script src="sorttable.js"></script>
+ <script src="./3rd-party/yarn/sorttable/sorttable.js"></script>
<script src="colordate.js"></script>
<!-- Scripts: Modules (run asynchronously after DOMContentLoaded) -->
diff --git a/public-src/require.config.js b/public-src/require.config.js
index 3e2ff4b..a3194d9 100644
--- a/public-src/require.config.js
+++ b/public-src/require.config.js
@@ -27,13 +27,12 @@ var require = {
"cfg/jarmon-proton": { deps: ["jquery", "jarmon"] },
},
paths: {
- //"flot" : "/3rd-party/yarn/flot",
+ "flot" : "/3rd-party/yarn/flot",
//"jquery" : "/3rd-party/yarn/jquery/dist/jquery",
"requirejs" : "/3rd-party/yarn/requirejs/require",
"cfg" : "/cfg",
"jarmon" : "/jarmon",
- "flot" : "/jarmon-dependencies/flot-0.8.3",
"javascriptrrd" : "/jarmon-dependencies/javascriptrrd-1.1.1",
"jquery" : "/jarmon-dependencies/jquery-1.6.3",
"jquerytools" : "/jarmon-dependencies/jquerytools-8ac4636a01d3860f1c4726ba722190a531bf1068",