From 40c0e9b8c5658bd8981ee0e38500beb13b7cabf7 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 29 Aug 2017 16:04:40 -0700 Subject: [PATCH] Use ES6 templates to reduce duplication in the demo HTML --- .gitignore | 1 + demo/client/html/include/header.html | 5 ++++ demo/client/html/include/navbar.html | 15 ++++++++++++ demo/client/html/svg.html | 23 ++---------------- demo/client/html/text.html | 23 ++---------------- demo/client/package.json | 3 +++ demo/client/src/svg.ts | 2 ++ demo/client/src/text.ts | 2 ++ demo/client/webpack.config.js | 35 ++++++++++++++++++++++++++-- demo/server/src/main.rs | 4 ++-- 10 files changed, 67 insertions(+), 46 deletions(-) create mode 100644 demo/client/html/include/header.html create mode 100644 demo/client/html/include/navbar.html diff --git a/.gitignore b/.gitignore index 9001a8f5..167255b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /font-renderer/target /partitioner/target /demo/client/target +/demo/client/*.html /demo/client/*.js /demo/client/src/*.js /demo/client/src/*.js.map diff --git a/demo/client/html/include/header.html b/demo/client/html/include/header.html new file mode 100644 index 00000000..6781fc46 --- /dev/null +++ b/demo/client/html/include/header.html @@ -0,0 +1,5 @@ + + + + + diff --git a/demo/client/html/include/navbar.html b/demo/client/html/include/navbar.html new file mode 100644 index 00000000..7891ddb7 --- /dev/null +++ b/demo/client/html/include/navbar.html @@ -0,0 +1,15 @@ + diff --git a/demo/client/html/svg.html b/demo/client/html/svg.html index 8cc6d040..47780448 100644 --- a/demo/client/html/svg.html +++ b/demo/client/html/svg.html @@ -3,30 +3,11 @@ SVG — Pathfinder Demo - - - - - + ${require('./include/header.html')} - + ${require('./include/navbar.html')}
0 ms
diff --git a/demo/client/html/text.html b/demo/client/html/text.html index 94324cd4..30c9a6c9 100644 --- a/demo/client/html/text.html +++ b/demo/client/html/text.html @@ -3,30 +3,11 @@ Text — Pathfinder Demo - - - - - + ${require('./include/header.html')} - + ${require('./include/navbar.html')}
0 ms