From 34ad431ef6987deb475af9dde7e6e646fc5e3b3e Mon Sep 17 00:00:00 2001 From: jodzga Date: Tue, 12 May 2015 11:52:59 -0700 Subject: [PATCH 001/508] Added version number to the tracevis - issue #56. Don't show popup when it is impossible to connect to tracevis server, instead degrade gracefully - issue #57. Add spellcheck="false" to textarea. --- tools/tracevis/Makefile | 4 +++- tools/tracevis/lib/render/graphviz.js | 2 +- tools/tracevis/trace.html | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/tracevis/Makefile b/tools/tracevis/Makefile index 3650ce97..2ec0ecbb 100644 --- a/tools/tracevis/Makefile +++ b/tools/tracevis/Makefile @@ -24,6 +24,8 @@ TEST_UNIT_COV = build/coverage/unit TEST_INT_COV = build/coverage/int TEST_ALL_COV = build/coverage/all +include ../../version.properties + # Targets .PHONY: all \ test test-unit test-int lint coverage \ @@ -45,7 +47,7 @@ build/$(MODULE_MIN_JS): build/$(MODULE_JS) build/tracevis: bootstrap css img trace.html | build/tracevis/js mkdir -p $@ cp -r $^ $@ - sed -e "s|node_modules/d3/d3.js|js/d3.min.js|" -e "s|node_modules/svg-injector/svg-injector.js|js/svg-injector.min.js|" -e "s|node_modules/svg-pan-zoom/dist/svg-pan-zoom.js|js/svg-pan-zoom.min.js|" -e "s|build/$(MODULE_JS)|js/$(MODULE_MIN_JS)|" trace.html > build/tracevis/trace.html + sed -e "s|vX.X.X|v$(version)|" -e "s|node_modules/d3/d3.js|js/d3.min.js|" -e "s|node_modules/svg-injector/svg-injector.js|js/svg-injector.min.js|" -e "s|node_modules/svg-pan-zoom/dist/svg-pan-zoom.js|js/svg-pan-zoom.min.js|" -e "s|build/$(MODULE_JS)|js/$(MODULE_MIN_JS)|" trace.html > build/tracevis/trace.html @echo build/tracevis/js: build/$(MODULE_JS) build/$(MODULE_MIN_JS) node_modules/d3/d3.min.js js/d3.slider.js node_modules/svg-injector/dist/svg-injector.min.js node_modules/svg-injector/dist/svg-injector.map.js node_modules/svg-pan-zoom/dist/svg-pan-zoom.min.js diff --git a/tools/tracevis/lib/render/graphviz.js b/tools/tracevis/lib/render/graphviz.js index eb3cdb42..51c9026e 100644 --- a/tools/tracevis/lib/render/graphviz.js +++ b/tools/tracevis/lib/render/graphviz.js @@ -271,7 +271,7 @@ function render(root, graph) { var textarea = root.append('textarea').style('width', '100%').style( 'height', '600px'); textarea.text(dot.write(graph)); - alert('Contacting TracevisServer failed, status: ' + xhr.status + '\n' + console.log('Contacting TracevisServer failed, status: ' + xhr.status + '\n' + xhr.responseText); } } diff --git a/tools/tracevis/trace.html b/tools/tracevis/trace.html index ae032edd..1fd6fa2e 100644 --- a/tools/tracevis/trace.html +++ b/tools/tracevis/trace.html @@ -44,7 +44,7 @@
@@ -60,7 +60,7 @@

ParSeq JSON Trace Viewer

- +