diff --git a/CTFd/themes/admin/assets/css/admin.scss b/CTFd/themes/admin/assets/css/admin.scss
index 0f28049d..e1f1acf7 100644
--- a/CTFd/themes/admin/assets/css/admin.scss
+++ b/CTFd/themes/admin/assets/css/admin.scss
@@ -1,7 +1,7 @@
@import "includes/sticky-footer.css";
#score-graph {
- height: 450px;
+ min-height: 400px;
display: block;
clear: both;
}
@@ -12,17 +12,22 @@
}
#keys-pie-graph {
- height: 400px;
+ min-height: 400px;
display: block;
}
#categories-pie-graph {
- height: 400px;
+ min-height: 400px;
display: block;
}
#solve-percentages-graph {
- height: 400px;
+ min-height: 400px;
+ display: block;
+}
+
+#score-distribution-graph {
+ min-height: 400px;
display: block;
}
diff --git a/CTFd/themes/admin/assets/js/pages/statistics.js b/CTFd/themes/admin/assets/js/pages/statistics.js
index f93478d0..7bc354a6 100644
--- a/CTFd/themes/admin/assets/js/pages/statistics.js
+++ b/CTFd/themes/admin/assets/js/pages/statistics.js
@@ -2,29 +2,16 @@ import "./main";
import "core/utils";
import CTFd from "core/CTFd";
import $ from "jquery";
-import Plotly from "plotly.js-basic-dist";
-// eslint-disable-next-line no-unused-vars
-import { createGraph, updateGraph } from "core/graphs";
+import echarts from "echarts/dist/echarts-en.common";
+import { colorHash } from "core/utils";
const graph_configs = {
"#solves-graph": {
- layout: annotations => ({
- title: "Solve Counts",
- annotations: annotations,
- xaxis: {
- title: "Challenge Name"
- },
- yaxis: {
- title: "Amount of Solves"
- }
- }),
- fn: () => "CTFd_solves_" + new Date().toISOString().slice(0, 19),
data: () => CTFd.api.get_challenge_solve_statistics(),
format: response => {
const data = response.data;
const chals = [];
const counts = [];
- const annotations = [];
const solves = {};
for (let c = 0; c < data.length; c++) {
solves[data[c]["id"]] = {
@@ -40,63 +27,155 @@ const graph_configs = {
$.each(solves_order, function(key, value) {
chals.push(solves[value].name);
counts.push(solves[value].solves);
- const result = {
- x: solves[value].name,
- y: solves[value].solves,
- text: solves[value].solves,
- xanchor: "center",
- yanchor: "bottom",
- showarrow: false
- };
- annotations.push(result);
});
- return [
- {
- type: "bar",
- x: chals,
- y: counts,
- text: counts,
- orientation: "v"
+ const option = {
+ title: {
+ left: "center",
+ text: "Solve Counts"
},
- annotations
- ];
+ tooltip: {
+ trigger: "item"
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ mark: { show: true },
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ["line", "bar"] },
+ restore: { show: true },
+ saveAsImage: { show: true }
+ }
+ },
+ xAxis: {
+ name: "Solve Count",
+ nameLocation: "middle",
+ type: "value"
+ },
+ yAxis: {
+ name: "Challenge Name",
+ nameLocation: "middle",
+ nameGap: 60,
+ type: "category",
+ data: chals,
+ axisLabel: {
+ interval: 0,
+ rotate: 0 //If the label names are too long you can manage this by rotating the label.
+ }
+ },
+ dataZoom: [
+ {
+ id: "dataZoomY",
+ type: "slider",
+ yAxisIndex: [0],
+ filterMode: "empty"
+ }
+ ],
+ series: [
+ {
+ itemStyle: { normal: { color: "#1f76b4" } },
+ data: counts,
+ type: "bar"
+ }
+ ]
+ };
+
+ return option;
}
},
"#keys-pie-graph": {
- layout: () => ({
- title: "Submission Percentages"
- }),
- fn: () => "CTFd_submissions_" + new Date().toISOString().slice(0, 19),
data: () => CTFd.api.get_submission_property_counts({ column: "type" }),
format: response => {
const data = response.data;
const solves = data["correct"];
const fails = data["incorrect"];
- return [
- {
- values: [solves, fails],
- labels: ["Correct", "Incorrect"],
- marker: {
- colors: ["rgb(0, 209, 64)", "rgb(207, 38, 0)"]
- },
- text: ["Solves", "Fails"],
- hole: 0.4,
- type: "pie"
+ let option = {
+ title: {
+ left: "center",
+ text: "Submission Percentages"
},
- null
- ];
+ tooltip: {
+ trigger: "item"
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ dataView: { show: true, readOnly: false },
+ saveAsImage: {}
+ }
+ },
+ legend: {
+ orient: "horizontal",
+ bottom: 0,
+ data: ["Fails", "Solves"]
+ },
+ series: [
+ {
+ name: "Submission Percentages",
+ type: "pie",
+ radius: ["30%", "50%"],
+ avoidLabelOverlap: false,
+ label: {
+ show: false,
+ position: "center"
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true,
+ formatter: function(data) {
+ return `${data.name} - ${data.value} (${data.percent}%)`;
+ }
+ },
+ labelLine: {
+ show: true
+ }
+ },
+ emphasis: {
+ label: {
+ show: true,
+ position: "center",
+ textStyle: {
+ fontSize: "14",
+ fontWeight: "normal"
+ }
+ }
+ }
+ },
+ emphasis: {
+ label: {
+ show: true,
+ fontSize: "30",
+ fontWeight: "bold"
+ }
+ },
+ labelLine: {
+ show: false
+ },
+ data: [
+ {
+ value: fails,
+ name: "Fails",
+ itemStyle: { color: "rgb(207, 38, 0)" }
+ },
+ {
+ value: solves,
+ name: "Solves",
+ itemStyle: { color: "rgb(0, 209, 64)" }
+ }
+ ]
+ }
+ ]
+ };
+
+ return option;
}
},
"#categories-pie-graph": {
- layout: () => ({
- title: "Category Breakdown"
- }),
data: () => CTFd.api.get_challenge_property_counts({ column: "category" }),
- fn: () => "CTFd_categories_" + new Date().toISOString().slice(0, 19),
format: response => {
const data = response.data;
@@ -115,15 +194,84 @@ const graph_configs = {
count.push(data[i].count);
}
- return [
- {
- values: count,
- labels: categories,
- hole: 0.4,
- type: "pie"
+ let option = {
+ title: {
+ left: "center",
+ text: "Category Breakdown"
},
- null
- ];
+ tooltip: {
+ trigger: "item"
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ dataView: { show: true, readOnly: false },
+ saveAsImage: {}
+ }
+ },
+ legend: {
+ orient: "horizontal",
+ bottom: 0,
+ data: []
+ },
+ series: [
+ {
+ name: "Category Breakdown",
+ type: "pie",
+ radius: ["30%", "50%"],
+ avoidLabelOverlap: false,
+ label: {
+ show: false,
+ position: "center"
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true,
+ formatter: function(data) {
+ return `${data.name} - ${data.value} (${data.percent}%)`;
+ }
+ },
+ labelLine: {
+ show: true
+ }
+ },
+ emphasis: {
+ label: {
+ show: true,
+ position: "center",
+ textStyle: {
+ fontSize: "14",
+ fontWeight: "normal"
+ }
+ }
+ }
+ },
+ emphasis: {
+ label: {
+ show: true,
+ fontSize: "30",
+ fontWeight: "bold"
+ }
+ },
+ labelLine: {
+ show: false
+ },
+ data: []
+ }
+ ]
+ };
+
+ categories.forEach((category, index) => {
+ option.legend.data.push(category);
+ option.series[0].data.push({
+ value: count[index],
+ name: category,
+ itemStyle: { color: colorHash(category) }
+ });
+ });
+
+ return option;
}
},
@@ -143,8 +291,6 @@ const graph_configs = {
annotations: annotations
}),
data: () => CTFd.api.get_challenge_solve_percentages(),
- fn: () =>
- "CTFd_challenge_percentages_" + new Date().toISOString().slice(0, 19),
format: response => {
const data = response.data;
@@ -168,15 +314,61 @@ const graph_configs = {
annotations.push(result);
}
- return [
- {
- type: "bar",
- x: names,
- y: percents,
- orientation: "v"
+ const option = {
+ title: {
+ left: "center",
+ text: "Solve Percentages per Challenge"
},
- annotations
- ];
+ tooltip: {
+ trigger: "item",
+ formatter: function(data) {
+ return `${data.name} - ${(Math.round(data.value * 10) / 10).toFixed(
+ 1
+ )}%`;
+ }
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ mark: { show: true },
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ["line", "bar"] },
+ restore: { show: true },
+ saveAsImage: { show: true }
+ }
+ },
+ xAxis: {
+ name: "Challenge Name",
+ nameGap: 40,
+ nameLocation: "middle",
+ type: "category",
+ data: names,
+ axisLabel: {
+ interval: 0,
+ rotate: 50
+ }
+ },
+ yAxis: {
+ name: "Percentage of {0} (%)".format(
+ CTFd.config.userMode.charAt(0).toUpperCase() +
+ CTFd.config.userMode.slice(1)
+ ),
+ nameGap: 50,
+ nameLocation: "middle",
+ type: "value",
+ min: 0,
+ max: 100
+ },
+ series: [
+ {
+ itemStyle: { normal: { color: "#1f76b4" } },
+ data: percents,
+ type: "bar"
+ }
+ ]
+ };
+
+ return option;
}
},
@@ -202,8 +394,6 @@ const graph_configs = {
) {
return response.json();
}),
- fn: () =>
- "CTFd_score_distribution_" + new Date().toISOString().slice(0, 19),
format: response => {
const data = response.data.brackets;
const keys = [];
@@ -222,36 +412,73 @@ const graph_configs = {
start = key;
});
- return [
- {
- type: "bar",
- x: brackets,
- y: sizes,
- orientation: "v"
- }
- ];
+ const option = {
+ title: {
+ left: "center",
+ text: "Score Distribution"
+ },
+ tooltip: {
+ trigger: "item"
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ mark: { show: true },
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ["line", "bar"] },
+ restore: { show: true },
+ saveAsImage: { show: true }
+ }
+ },
+ xAxis: {
+ name: "Score Bracket",
+ nameGap: 40,
+ nameLocation: "middle",
+ type: "category",
+ data: brackets
+ },
+ yAxis: {
+ name: "Number of {0}".format(
+ CTFd.config.userMode.charAt(0).toUpperCase() +
+ CTFd.config.userMode.slice(1)
+ ),
+ nameGap: 50,
+ nameLocation: "middle",
+ type: "value"
+ },
+ series: [
+ {
+ itemStyle: { normal: { color: "#1f76b4" } },
+ data: sizes,
+ type: "bar"
+ }
+ ]
+ };
+
+ return option;
}
}
};
-const config = {
- displaylogo: false,
- responsive: true
-};
-
const createGraphs = () => {
for (let key in graph_configs) {
const cfg = graph_configs[key];
const $elem = $(key);
$elem.empty();
- $elem[0].fn = cfg.fn();
+
+ let chart = echarts.init(document.querySelector(key));
cfg
.data()
.then(cfg.format)
- .then(([data, annotations]) => {
- Plotly.newPlot($elem[0], [data], cfg.layout(annotations), config);
+ .then(option => {
+ chart.setOption(option);
+ $(window).on("resize", function() {
+ if (chart != null && chart != undefined) {
+ chart.resize();
+ }
+ });
});
}
};
@@ -259,13 +486,12 @@ const createGraphs = () => {
function updateGraphs() {
for (let key in graph_configs) {
const cfg = graph_configs[key];
- const $elem = $(key);
+ let chart = echarts.init(document.querySelector(key));
cfg
.data()
.then(cfg.format)
- .then(([data, annotations]) => {
- // FIXME: Pass annotations
- Plotly.react($elem[0], [data], cfg.layout(annotations), config);
+ .then(option => {
+ chart.setOption(option);
});
}
}
diff --git a/CTFd/themes/admin/static/css/admin.dev.css b/CTFd/themes/admin/static/css/admin.dev.css
index 41032e06..e246e895 100644
--- a/CTFd/themes/admin/static/css/admin.dev.css
+++ b/CTFd/themes/admin/static/css/admin.dev.css
@@ -1,4 +1,4 @@
html{position:relative;min-height:100%}body{margin-bottom:60px}.footer{position:absolute;bottom:1px;width:100%;height:60px;line-height:normal !important;z-index:-20}
-#score-graph{height:450px;display:block;clear:both}#solves-graph{display:block;height:350px}#keys-pie-graph{height:400px;display:block}#categories-pie-graph{height:400px;display:block}#solve-percentages-graph{height:400px;display:block}.no-decoration{color:inherit !important;text-decoration:none !important}.no-decoration:hover{color:inherit !important;text-decoration:none !important}.table td,.table th{vertical-align:inherit}pre{white-space:pre-wrap;margin:0;padding:0}.form-control{position:relative;display:block;border-radius:0;font-weight:400;font-family:"Avenir Next", "Helvetica Neue", Helvetica, Arial, sans-serif;-webkit-appearance:none}tbody tr:hover{background-color:rgba(0,0,0,0.1) !important}[data-href]{cursor:pointer}.sort-col{cursor:pointer}input[type="checkbox"]{cursor:pointer}
+#score-graph{min-height:400px;display:block;clear:both}#solves-graph{display:block;height:350px}#keys-pie-graph{min-height:400px;display:block}#categories-pie-graph{min-height:400px;display:block}#solve-percentages-graph{min-height:400px;display:block}#score-distribution-graph{min-height:400px;display:block}.no-decoration{color:inherit !important;text-decoration:none !important}.no-decoration:hover{color:inherit !important;text-decoration:none !important}.table td,.table th{vertical-align:inherit}pre{white-space:pre-wrap;margin:0;padding:0}.form-control{position:relative;display:block;border-radius:0;font-weight:400;font-family:"Avenir Next", "Helvetica Neue", Helvetica, Arial, sans-serif;-webkit-appearance:none}tbody tr:hover{background-color:rgba(0,0,0,0.1) !important}[data-href]{cursor:pointer}.sort-col{cursor:pointer}input[type="checkbox"]{cursor:pointer}
diff --git a/CTFd/themes/admin/static/css/admin.min.css b/CTFd/themes/admin/static/css/admin.min.css
index d58df70a..8d4e944b 100644
--- a/CTFd/themes/admin/static/css/admin.min.css
+++ b/CTFd/themes/admin/static/css/admin.min.css
@@ -1 +1 @@
-html{position:relative;min-height:100%}body{margin-bottom:60px}.footer{position:absolute;bottom:1px;width:100%;height:60px;line-height:normal!important;z-index:-20}#score-graph{height:450px;display:block;clear:both}#solves-graph{display:block;height:350px}#categories-pie-graph,#keys-pie-graph,#solve-percentages-graph{height:400px;display:block}.no-decoration,.no-decoration:hover{color:inherit!important;text-decoration:none!important}.table td,.table th{vertical-align:inherit}pre{white-space:pre-wrap;margin:0;padding:0}.form-control{position:relative;display:block;border-radius:0;font-weight:400;font-family:Avenir Next,Helvetica Neue,Helvetica,Arial,sans-serif;-webkit-appearance:none}tbody tr:hover{background-color:rgba(0,0,0,.1)!important}.sort-col,[data-href],input[type=checkbox]{cursor:pointer}
\ No newline at end of file
+html{position:relative;min-height:100%}body{margin-bottom:60px}.footer{position:absolute;bottom:1px;width:100%;height:60px;line-height:normal!important;z-index:-20}#score-graph{min-height:400px;display:block;clear:both}#solves-graph{display:block;height:350px}#categories-pie-graph,#keys-pie-graph,#score-distribution-graph,#solve-percentages-graph{min-height:400px;display:block}.no-decoration,.no-decoration:hover{color:inherit!important;text-decoration:none!important}.table td,.table th{vertical-align:inherit}pre{white-space:pre-wrap;margin:0;padding:0}.form-control{position:relative;display:block;border-radius:0;font-weight:400;font-family:Avenir Next,Helvetica Neue,Helvetica,Arial,sans-serif;-webkit-appearance:none}tbody tr:hover{background-color:rgba(0,0,0,.1)!important}.sort-col,[data-href],input[type=checkbox]{cursor:pointer}
\ No newline at end of file
diff --git a/CTFd/themes/admin/static/js/core.dev.js b/CTFd/themes/admin/static/js/core.dev.js
index 2d387b9a..8879cf7f 100644
--- a/CTFd/themes/admin/static/js/core.dev.js
+++ b/CTFd/themes/admin/static/js/core.dev.js
@@ -128,7 +128,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n
/***/ (function(module, exports, __webpack_require__) {
;
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.WindowController = WindowController;\nexports.colorHash = colorHash;\nexports.htmlEntities = htmlEntities;\nexports.cumulativeSum = cumulativeSum;\nexports.init_notification_counter = init_notification_counter;\nexports.set_notification_counter = set_notification_counter;\nexports.inc_notification_counter = inc_notification_counter;\nexports.dec_notification_counter = dec_notification_counter;\nexports.clear_notification_counter = clear_notification_counter;\nexports.copyToClipboard = copyToClipboard;\nexports.makeSortableTables = makeSortableTables;\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\n_jquery.default.fn.serializeJSON = function (omit_nulls) {\n var params = {};\n var form = (0, _jquery.default)(this);\n var values = form.serializeArray();\n values = values.concat(form.find(\"input[type=checkbox]:checked\").map(function () {\n return {\n name: this.name,\n value: true\n };\n }).get());\n values = values.concat(form.find(\"input[type=checkbox]:not(:checked)\").map(function () {\n return {\n name: this.name,\n value: false\n };\n }).get());\n values.map(function (x) {\n if (omit_nulls) {\n if (x.value !== null && x.value !== \"\") {\n params[x.name] = x.value;\n } else {\n var input = form.find(\":input[name=\".concat(x.name, \"]\"));\n\n if (input.data(\"initial\") !== input.val()) {\n params[x.name] = x.value;\n }\n }\n } else {\n params[x.name] = x.value;\n }\n });\n return params;\n}; //http://stackoverflow.com/a/2648463 - wizardry!\n\n\nString.prototype.format = String.prototype.f = function () {\n var s = this,\n i = arguments.length;\n\n while (i--) {\n s = s.replace(new RegExp(\"\\\\{\" + i + \"\\\\}\", \"gm\"), arguments[i]);\n }\n\n return s;\n}; //http://stackoverflow.com/a/7616484\n\n\nString.prototype.hashCode = function () {\n var hash = 0,\n i,\n chr,\n len;\n if (this.length == 0) return hash;\n\n for (i = 0, len = this.length; i < len; i++) {\n chr = this.charCodeAt(i);\n hash = (hash << 5) - hash + chr;\n hash |= 0; // Convert to 32bit integer\n }\n\n return hash;\n}; // https://gist.github.com/neilj/4146038\n// https://fastmail.blog/2012/11/26/inter-tab-communication-using-local-storage/\n\n\nfunction WindowController() {\n this.id = Math.random();\n this.isMaster = false;\n this.others = {};\n window.addEventListener(\"storage\", this, false);\n window.addEventListener(\"unload\", this, false);\n this.broadcast(\"hello\");\n var that = this;\n\n var check = function check() {\n that.check();\n that._checkTimeout = setTimeout(check, 9000);\n };\n\n var ping = function ping() {\n that.sendPing();\n that._pingTimeout = setTimeout(ping, 17000);\n };\n\n this._checkTimeout = setTimeout(check, 500);\n this._pingTimeout = setTimeout(ping, 17000);\n}\n\nWindowController.prototype.destroy = function () {\n clearTimeout(this._pingTimeout);\n clearTimeout(this._checkTimeout);\n window.removeEventListener(\"storage\", this, false);\n window.removeEventListener(\"unload\", this, false);\n this.broadcast(\"bye\");\n};\n\nWindowController.prototype.handleEvent = function (event) {\n if (event.type === \"unload\") {\n this.destroy();\n } else if (event.key === \"broadcast\") {\n try {\n var data = JSON.parse(event.newValue);\n\n if (data.id !== this.id) {\n this[data.type](data);\n }\n } catch (error) {// Ignore error\n }\n }\n};\n\nWindowController.prototype.sendPing = function () {\n this.broadcast(\"ping\");\n};\n\nWindowController.prototype.hello = function (event) {\n this.ping(event);\n\n if (event.id < this.id) {\n this.check();\n } else {\n this.sendPing();\n }\n};\n\nWindowController.prototype.ping = function (event) {\n this.others[event.id] = +new Date();\n};\n\nWindowController.prototype.bye = function (event) {\n delete this.others[event.id];\n this.check();\n};\n\nWindowController.prototype.check = function (_event) {\n var now = +new Date(),\n takeMaster = true,\n id;\n\n for (id in this.others) {\n if (this.others[id] + 23000 < now) {\n delete this.others[id];\n } else if (id < this.id) {\n takeMaster = false;\n }\n }\n\n if (this.isMaster !== takeMaster) {\n this.isMaster = takeMaster;\n this.masterDidChange();\n }\n};\n\nWindowController.prototype.masterDidChange = function () {};\n\nWindowController.prototype.broadcast = function (type, data) {\n var event = {\n id: this.id,\n type: type\n };\n\n for (var x in data) {\n event[x] = data[x];\n }\n\n try {\n localStorage.setItem(\"broadcast\", JSON.stringify(event));\n } catch (error) {\n // eslint-disable-next-line no-console\n console.log(error);\n }\n};\n\nfunction colorHash(str) {\n var hash = 0;\n\n for (var i = 0; i < str.length; i++) {\n hash = str.charCodeAt(i) + ((hash << 5) - hash);\n }\n\n var colour = \"#\";\n\n for (var _i = 0; _i < 3; _i++) {\n var value = hash >> _i * 8 & 0xff;\n colour += (\"00\" + value.toString(16)).substr(-2);\n }\n\n return colour;\n}\n\nfunction htmlEntities(string) {\n return (0, _jquery.default)(\"\").text(string).html();\n}\n\nfunction cumulativeSum(arr) {\n var result = arr.concat();\n\n for (var i = 0; i < arr.length; i++) {\n result[i] = arr.slice(0, i + 1).reduce(function (p, i) {\n return p + i;\n });\n }\n\n return result;\n}\n\nvar storage = window.localStorage;\nvar counter_key = \"unread_notifications\";\n\nfunction init_notification_counter() {\n var count = storage.getItem(counter_key);\n\n if (count === null) {\n storage.setItem(counter_key, 0);\n } else {\n if (count > 0) {\n (0, _jquery.default)(\".badge-notification\").text(count);\n }\n }\n}\n\nfunction set_notification_counter(count) {\n storage.setItem(counter_key, count);\n}\n\nfunction inc_notification_counter() {\n var count = storage.getItem(counter_key) || 0;\n storage.setItem(counter_key, ++count);\n (0, _jquery.default)(\".badge-notification\").text(count);\n}\n\nfunction dec_notification_counter() {\n var count = storage.getItem(counter_key) || 0;\n\n if (count > 0) {\n storage.setItem(counter_key, --count);\n (0, _jquery.default)(\".badge-notification\").text(count);\n } // Always clear if count is 0\n\n\n if (count == 0) {\n clear_notification_counter();\n }\n}\n\nfunction clear_notification_counter() {\n storage.setItem(counter_key, 0);\n (0, _jquery.default)(\".badge-notification\").empty();\n}\n\nfunction copyToClipboard(event, selector) {\n // Select element\n (0, _jquery.default)(selector).select(); // Copy to clipboard\n\n document.execCommand(\"copy\"); // Show tooltip to user\n\n (0, _jquery.default)(event.target).tooltip({\n title: \"Copied!\",\n trigger: \"manual\"\n });\n (0, _jquery.default)(event.target).tooltip(\"show\");\n setTimeout(function () {\n (0, _jquery.default)(event.target).tooltip(\"hide\");\n }, 1500);\n}\n\nfunction makeSortableTables() {\n (0, _jquery.default)(\"th.sort-col\").append(\" \");\n (0, _jquery.default)(\"th.sort-col\").click(function () {\n var table = (0, _jquery.default)(this).parents(\"table\").eq(0);\n var rows = table.find(\"tr:gt(0)\").toArray().sort(comparer((0, _jquery.default)(this).index()));\n this.asc = !this.asc;\n\n if (!this.asc) {\n rows = rows.reverse();\n }\n\n for (var i = 0; i < rows.length; i++) {\n table.append(rows[i]);\n }\n });\n\n function comparer(index) {\n return function (a, b) {\n var valA = getCellValue(a, index),\n valB = getCellValue(b, index);\n return _jquery.default.isNumeric(valA) && _jquery.default.isNumeric(valB) ? valA - valB : valA.toString().localeCompare(valB);\n };\n }\n\n function getCellValue(row, index) {\n return (0, _jquery.default)(row).children(\"td\").eq(index).text();\n }\n}\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/utils.js?");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.WindowController = WindowController;\nexports.colorHash = colorHash;\nexports.htmlEntities = htmlEntities;\nexports.cumulativeSum = cumulativeSum;\nexports.init_notification_counter = init_notification_counter;\nexports.set_notification_counter = set_notification_counter;\nexports.inc_notification_counter = inc_notification_counter;\nexports.dec_notification_counter = dec_notification_counter;\nexports.clear_notification_counter = clear_notification_counter;\nexports.copyToClipboard = copyToClipboard;\nexports.makeSortableTables = makeSortableTables;\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\n_jquery.default.fn.serializeJSON = function (omit_nulls) {\n var params = {};\n var form = (0, _jquery.default)(this);\n var values = form.serializeArray();\n values = values.concat(form.find(\"input[type=checkbox]:checked\").map(function () {\n return {\n name: this.name,\n value: true\n };\n }).get());\n values = values.concat(form.find(\"input[type=checkbox]:not(:checked)\").map(function () {\n return {\n name: this.name,\n value: false\n };\n }).get());\n values.map(function (x) {\n if (omit_nulls) {\n if (x.value !== null && x.value !== \"\") {\n params[x.name] = x.value;\n } else {\n var input = form.find(\":input[name=\".concat(x.name, \"]\"));\n\n if (input.data(\"initial\") !== input.val()) {\n params[x.name] = x.value;\n }\n }\n } else {\n params[x.name] = x.value;\n }\n });\n return params;\n}; //http://stackoverflow.com/a/2648463 - wizardry!\n\n\nString.prototype.format = String.prototype.f = function () {\n var s = this,\n i = arguments.length;\n\n while (i--) {\n s = s.replace(new RegExp(\"\\\\{\" + i + \"\\\\}\", \"gm\"), arguments[i]);\n }\n\n return s;\n}; //http://stackoverflow.com/a/7616484\n\n\nString.prototype.hashCode = function () {\n var hash = 0,\n i,\n chr,\n len;\n if (this.length == 0) return hash;\n\n for (i = 0, len = this.length; i < len; i++) {\n chr = this.charCodeAt(i);\n hash = (hash << 5) - hash + chr;\n hash |= 0; // Convert to 32bit integer\n }\n\n return hash;\n}; // https://gist.github.com/neilj/4146038\n// https://fastmail.blog/2012/11/26/inter-tab-communication-using-local-storage/\n\n\nfunction WindowController() {\n this.id = Math.random();\n this.isMaster = false;\n this.others = {};\n window.addEventListener(\"storage\", this, false);\n window.addEventListener(\"unload\", this, false);\n this.broadcast(\"hello\");\n var that = this;\n\n var check = function check() {\n that.check();\n that._checkTimeout = setTimeout(check, 9000);\n };\n\n var ping = function ping() {\n that.sendPing();\n that._pingTimeout = setTimeout(ping, 17000);\n };\n\n this._checkTimeout = setTimeout(check, 500);\n this._pingTimeout = setTimeout(ping, 17000);\n}\n\nWindowController.prototype.destroy = function () {\n clearTimeout(this._pingTimeout);\n clearTimeout(this._checkTimeout);\n window.removeEventListener(\"storage\", this, false);\n window.removeEventListener(\"unload\", this, false);\n this.broadcast(\"bye\");\n};\n\nWindowController.prototype.handleEvent = function (event) {\n if (event.type === \"unload\") {\n this.destroy();\n } else if (event.key === \"broadcast\") {\n try {\n var data = JSON.parse(event.newValue);\n\n if (data.id !== this.id) {\n this[data.type](data);\n }\n } catch (error) {// Ignore error\n }\n }\n};\n\nWindowController.prototype.sendPing = function () {\n this.broadcast(\"ping\");\n};\n\nWindowController.prototype.hello = function (event) {\n this.ping(event);\n\n if (event.id < this.id) {\n this.check();\n } else {\n this.sendPing();\n }\n};\n\nWindowController.prototype.ping = function (event) {\n this.others[event.id] = +new Date();\n};\n\nWindowController.prototype.bye = function (event) {\n delete this.others[event.id];\n this.check();\n};\n\nWindowController.prototype.check = function (_event) {\n var now = +new Date(),\n takeMaster = true,\n id;\n\n for (id in this.others) {\n if (this.others[id] + 23000 < now) {\n delete this.others[id];\n } else if (id < this.id) {\n takeMaster = false;\n }\n }\n\n if (this.isMaster !== takeMaster) {\n this.isMaster = takeMaster;\n this.masterDidChange();\n }\n};\n\nWindowController.prototype.masterDidChange = function () {};\n\nWindowController.prototype.broadcast = function (type, data) {\n var event = {\n id: this.id,\n type: type\n };\n\n for (var x in data) {\n event[x] = data[x];\n }\n\n try {\n localStorage.setItem(\"broadcast\", JSON.stringify(event));\n } catch (error) {\n // eslint-disable-next-line no-console\n console.log(error);\n }\n};\n\nfunction colorHash(str) {\n var hash = 0;\n\n for (var i = 0; i < str.length; i++) {\n hash = str.charCodeAt(i) + ((hash << 5) - hash);\n }\n\n var colour = \"#\";\n\n for (var _i = 0; _i < 3; _i++) {\n var value = hash >> _i * 4 & 0xff;\n colour += (\"00\" + value.toString(16)).substr(-2);\n }\n\n return colour;\n}\n\nfunction htmlEntities(string) {\n return (0, _jquery.default)(\"\").text(string).html();\n}\n\nfunction cumulativeSum(arr) {\n var result = arr.concat();\n\n for (var i = 0; i < arr.length; i++) {\n result[i] = arr.slice(0, i + 1).reduce(function (p, i) {\n return p + i;\n });\n }\n\n return result;\n}\n\nvar storage = window.localStorage;\nvar counter_key = \"unread_notifications\";\n\nfunction init_notification_counter() {\n var count = storage.getItem(counter_key);\n\n if (count === null) {\n storage.setItem(counter_key, 0);\n } else {\n if (count > 0) {\n (0, _jquery.default)(\".badge-notification\").text(count);\n }\n }\n}\n\nfunction set_notification_counter(count) {\n storage.setItem(counter_key, count);\n}\n\nfunction inc_notification_counter() {\n var count = storage.getItem(counter_key) || 0;\n storage.setItem(counter_key, ++count);\n (0, _jquery.default)(\".badge-notification\").text(count);\n}\n\nfunction dec_notification_counter() {\n var count = storage.getItem(counter_key) || 0;\n\n if (count > 0) {\n storage.setItem(counter_key, --count);\n (0, _jquery.default)(\".badge-notification\").text(count);\n } // Always clear if count is 0\n\n\n if (count == 0) {\n clear_notification_counter();\n }\n}\n\nfunction clear_notification_counter() {\n storage.setItem(counter_key, 0);\n (0, _jquery.default)(\".badge-notification\").empty();\n}\n\nfunction copyToClipboard(event, selector) {\n // Select element\n (0, _jquery.default)(selector).select(); // Copy to clipboard\n\n document.execCommand(\"copy\"); // Show tooltip to user\n\n (0, _jquery.default)(event.target).tooltip({\n title: \"Copied!\",\n trigger: \"manual\"\n });\n (0, _jquery.default)(event.target).tooltip(\"show\");\n setTimeout(function () {\n (0, _jquery.default)(event.target).tooltip(\"hide\");\n }, 1500);\n}\n\nfunction makeSortableTables() {\n (0, _jquery.default)(\"th.sort-col\").append(\" \");\n (0, _jquery.default)(\"th.sort-col\").click(function () {\n var table = (0, _jquery.default)(this).parents(\"table\").eq(0);\n var rows = table.find(\"tr:gt(0)\").toArray().sort(comparer((0, _jquery.default)(this).index()));\n this.asc = !this.asc;\n\n if (!this.asc) {\n rows = rows.reverse();\n }\n\n for (var i = 0; i < rows.length; i++) {\n table.append(rows[i]);\n }\n });\n\n function comparer(index) {\n return function (a, b) {\n var valA = getCellValue(a, index),\n valB = getCellValue(b, index);\n return _jquery.default.isNumeric(valA) && _jquery.default.isNumeric(valB) ? valA - valB : valA.toString().localeCompare(valB);\n };\n }\n\n function getCellValue(row, index) {\n return (0, _jquery.default)(row).children(\"td\").eq(index).text();\n }\n}\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/utils.js?");
/***/ }),
diff --git a/CTFd/themes/admin/static/js/echarts.bundle.dev.js b/CTFd/themes/admin/static/js/echarts.bundle.dev.js
new file mode 100644
index 00000000..d34a6efc
--- /dev/null
+++ b/CTFd/themes/admin/static/js/echarts.bundle.dev.js
@@ -0,0 +1,15 @@
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([["echarts"],{
+
+/***/ "./node_modules/echarts/dist/echarts-en.common.js":
+/*!********************************************************!*\
+ !*** ./node_modules/echarts/dist/echarts-en.common.js ***!
+ \********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+;
+eval("/* WEBPACK VAR INJECTION */(function(global) {var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;function _typeof(obj){if(typeof Symbol===\"function\"&&typeof Symbol.iterator===\"symbol\"){_typeof=function _typeof(obj){return typeof obj;};}else{_typeof=function _typeof(obj){return obj&&typeof Symbol===\"function\"&&obj.constructor===Symbol&&obj!==Symbol.prototype?\"symbol\":typeof obj;};}return _typeof(obj);}(function(global,factory){( false?undefined:_typeof(exports))==='object'&&typeof module!=='undefined'?factory(exports): true?!(__WEBPACK_AMD_DEFINE_ARRAY__ = [exports], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),\n\t\t\t\t__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?\n\t\t\t\t(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),\n\t\t\t\t__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)):undefined;})(void 0,function(exports){'use strict';/*\n* Licensed to the Apache Software Foundation (ASF) under one\n* or more contributor license agreements. See the NOTICE file\n* distributed with this work for additional information\n* regarding copyright ownership. The ASF licenses this file\n* to you under the Apache License, Version 2.0 (the\n* \"License\"); you may not use this file except in compliance\n* with the License. You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing,\n* software distributed under the License is distributed on an\n* \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n* KIND, either express or implied. See the License for the\n* specific language governing permissions and limitations\n* under the License.\n*/ // (1) The code `if (__DEV__) ...` can be removed by build tool.\n// (2) If intend to use `__DEV__`, this module should be imported. Use a global\n// variable `__DEV__` may cause that miss the declaration (see #6535), or the\n// declaration is behind of the using position (for example in `Model.extent`,\n// And tools like rollup can not analysis the dependency if not import).\nvar dev;// In browser\nif(typeof window!=='undefined'){dev=window.__DEV__;}// In node\nelse if(typeof global!=='undefined'){dev=global.__DEV__;}if(typeof dev==='undefined'){dev=true;}var __DEV__=dev;/**\n * zrender: 生成唯一id\n *\n * @author errorrik (errorrik@gmail.com)\n */var idStart=0x0907;var guid=function guid(){return idStart++;};/**\n * echarts设备环境识别\n *\n * @desc echarts基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据统计图表。\n * @author firede[firede@firede.us]\n * @desc thanks zepto.\n */ /* global wx */var env={};if((typeof wx===\"undefined\"?\"undefined\":_typeof(wx))==='object'&&typeof wx.getSystemInfoSync==='function'){// In Weixin Application\nenv={browser:{},os:{},node:false,wxa:true,// Weixin Application\ncanvasSupported:true,svgSupported:false,touchEventsSupported:true,domSupported:false};}else if(typeof document==='undefined'&&typeof self!=='undefined'){// In worker\nenv={browser:{},os:{},node:false,worker:true,canvasSupported:true,domSupported:false};}else if(typeof navigator==='undefined'){// In node\nenv={browser:{},os:{},node:true,worker:false,// Assume canvas is supported\ncanvasSupported:true,svgSupported:true,domSupported:false};}else{env=detect(navigator.userAgent);}var env$1=env;// Zepto.js\n// (c) 2010-2013 Thomas Fuchs\n// Zepto.js may be freely distributed under the MIT license.\nfunction detect(ua){var os={};var browser={};// var webkit = ua.match(/Web[kK]it[\\/]{0,1}([\\d.]+)/);\n// var android = ua.match(/(Android);?[\\s\\/]+([\\d.]+)?/);\n// var ipad = ua.match(/(iPad).*OS\\s([\\d_]+)/);\n// var ipod = ua.match(/(iPod)(.*OS\\s([\\d_]+))?/);\n// var iphone = !ipad && ua.match(/(iPhone\\sOS)\\s([\\d_]+)/);\n// var webos = ua.match(/(webOS|hpwOS)[\\s\\/]([\\d.]+)/);\n// var touchpad = webos && ua.match(/TouchPad/);\n// var kindle = ua.match(/Kindle\\/([\\d.]+)/);\n// var silk = ua.match(/Silk\\/([\\d._]+)/);\n// var blackberry = ua.match(/(BlackBerry).*Version\\/([\\d.]+)/);\n// var bb10 = ua.match(/(BB10).*Version\\/([\\d.]+)/);\n// var rimtabletos = ua.match(/(RIM\\sTablet\\sOS)\\s([\\d.]+)/);\n// var playbook = ua.match(/PlayBook/);\n// var chrome = ua.match(/Chrome\\/([\\d.]+)/) || ua.match(/CriOS\\/([\\d.]+)/);\nvar firefox=ua.match(/Firefox\\/([\\d.]+)/);// var safari = webkit && ua.match(/Mobile\\//) && !chrome;\n// var webview = ua.match(/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/) && !chrome;\nvar ie=ua.match(/MSIE\\s([\\d.]+)/)// IE 11 Trident/7.0; rv:11.0\n||ua.match(/Trident\\/.+?rv:(([\\d.]+))/);var edge=ua.match(/Edge\\/([\\d.]+)/);// IE 12 and 12+\nvar weChat=/micromessenger/i.test(ua);// Todo: clean this up with a better OS/browser seperation:\n// - discern (more) between multiple browsers on android\n// - decide if kindle fire in silk mode is android or not\n// - Firefox on Android doesn't specify the Android version\n// - possibly devide in os, device and browser hashes\n// if (browser.webkit = !!webkit) browser.version = webkit[1];\n// if (android) os.android = true, os.version = android[2];\n// if (iphone && !ipod) os.ios = os.iphone = true, os.version = iphone[2].replace(/_/g, '.');\n// if (ipad) os.ios = os.ipad = true, os.version = ipad[2].replace(/_/g, '.');\n// if (ipod) os.ios = os.ipod = true, os.version = ipod[3] ? ipod[3].replace(/_/g, '.') : null;\n// if (webos) os.webos = true, os.version = webos[2];\n// if (touchpad) os.touchpad = true;\n// if (blackberry) os.blackberry = true, os.version = blackberry[2];\n// if (bb10) os.bb10 = true, os.version = bb10[2];\n// if (rimtabletos) os.rimtabletos = true, os.version = rimtabletos[2];\n// if (playbook) browser.playbook = true;\n// if (kindle) os.kindle = true, os.version = kindle[1];\n// if (silk) browser.silk = true, browser.version = silk[1];\n// if (!silk && os.android && ua.match(/Kindle Fire/)) browser.silk = true;\n// if (chrome) browser.chrome = true, browser.version = chrome[1];\nif(firefox){browser.firefox=true;browser.version=firefox[1];}// if (safari && (ua.match(/Safari/) || !!os.ios)) browser.safari = true;\n// if (webview) browser.webview = true;\nif(ie){browser.ie=true;browser.version=ie[1];}if(edge){browser.edge=true;browser.version=edge[1];}// It is difficult to detect WeChat in Win Phone precisely, because ua can\n// not be set on win phone. So we do not consider Win Phone.\nif(weChat){browser.weChat=true;}// os.tablet = !!(ipad || playbook || (android && !ua.match(/Mobile/)) ||\n// (firefox && ua.match(/Tablet/)) || (ie && !ua.match(/Phone/) && ua.match(/Touch/)));\n// os.phone = !!(!os.tablet && !os.ipod && (android || iphone || webos ||\n// (chrome && ua.match(/Android/)) || (chrome && ua.match(/CriOS\\/([\\d.]+)/)) ||\n// (firefox && ua.match(/Mobile/)) || (ie && ua.match(/Touch/))));\nreturn{browser:browser,os:os,node:false,// 原生canvas支持，改极端点了\n// canvasSupported : !(browser.ie && parseFloat(browser.version) < 9)\ncanvasSupported:!!document.createElement('canvas').getContext,svgSupported:typeof SVGRect!=='undefined',// works on most browsers\n// IE10/11 does not support touch event, and MS Edge supports them but not by\n// default, so we dont check navigator.maxTouchPoints for them here.\ntouchEventsSupported:'ontouchstart'in window&&!browser.ie&&!browser.edge,// .\npointerEventsSupported:// (1) Firefox supports pointer but not by default, only MS browsers are reliable on pointer\n// events currently. So we dont use that on other browsers unless tested sufficiently.\n// For example, in iOS 13 Mobile Chromium 78, if the touching behavior starts page\n// scroll, the `pointermove` event can not be fired any more. That will break some\n// features like \"pan horizontally to move something and pan vertically to page scroll\".\n// The horizontal pan probably be interrupted by the casually triggered page scroll.\n// (2) Although IE 10 supports pointer event, it use old style and is different from the\n// standard. So we exclude that. (IE 10 is hardly used on touch device)\n'onpointerdown'in window&&(browser.edge||browser.ie&&browser.version>=11),// passiveSupported: detectPassiveSupport()\ndomSupported:typeof document!=='undefined'};}// See https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md#feature-detection\n// function detectPassiveSupport() {\n// // Test via a getter in the options object to see if the passive property is accessed\n// var supportsPassive = false;\n// try {\n// var opts = Object.defineProperty({}, 'passive', {\n// get: function() {\n// supportsPassive = true;\n// }\n// });\n// window.addEventListener('testPassive', function() {}, opts);\n// } catch (e) {\n// }\n// return supportsPassive;\n// }\n/**\n * @module zrender/core/util\n */ // 用于处理merge时无法遍历Date等对象的问题\nvar BUILTIN_OBJECT={'[object Function]':1,'[object RegExp]':1,'[object Date]':1,'[object Error]':1,'[object CanvasGradient]':1,'[object CanvasPattern]':1,// For node-canvas\n'[object Image]':1,'[object Canvas]':1};var TYPED_ARRAY={'[object Int8Array]':1,'[object Uint8Array]':1,'[object Uint8ClampedArray]':1,'[object Int16Array]':1,'[object Uint16Array]':1,'[object Int32Array]':1,'[object Uint32Array]':1,'[object Float32Array]':1,'[object Float64Array]':1};var objToString=Object.prototype.toString;var arrayProto=Array.prototype;var nativeForEach=arrayProto.forEach;var nativeFilter=arrayProto.filter;var nativeSlice=arrayProto.slice;var nativeMap=arrayProto.map;var nativeReduce=arrayProto.reduce;// Avoid assign to an exported variable, for transforming to cjs.\nvar methods={};function $override(name,fn){// Clear ctx instance for different environment\nif(name==='createCanvas'){_ctx=null;}methods[name]=fn;}/**\n * Those data types can be cloned:\n * Plain object, Array, TypedArray, number, string, null, undefined.\n * Those data types will be assgined using the orginal data:\n * BUILTIN_OBJECT\n * Instance of user defined class will be cloned to a plain object, without\n * properties in prototype.\n * Other data types is not supported (not sure what will happen).\n *\n * Caution: do not support clone Date, for performance consideration.\n * (There might be a large number of date in `series.data`).\n * So date should not be modified in and out of echarts.\n *\n * @param {*} source\n * @return {*} new\n */function _clone(source){if(source==null||_typeof(source)!=='object'){return source;}var result=source;var typeStr=objToString.call(source);if(typeStr==='[object Array]'){if(!isPrimitive(source)){result=[];for(var i=0,len=source.length;i [3, 3, 3, 3]\n * [4, 2] => [4, 2, 4, 2]\n * [4, 3, 2] => [4, 3, 2, 3]\n * @param {number|Array.} val\n * @return {Array.}\n */function normalizeCssArray(val){if(typeof val==='number'){return[val,val,val,val];}var len=val.length;if(len===2){// vertical | horizontal\nreturn[val[0],val[1],val[0],val[1]];}else if(len===3){// top | horizontal | bottom\nreturn[val[0],val[1],val[2],val[1]];}return val;}/**\n * @memberOf module:zrender/core/util\n * @param {boolean} condition\n * @param {string} message\n */function assert$1(condition,message){if(!condition){throw new Error(message);}}/**\n * @memberOf module:zrender/core/util\n * @param {string} str string to be trimed\n * @return {string} trimed string\n */function trim(str){if(str==null){return null;}else if(typeof str.trim==='function'){return str.trim();}else{return str.replace(/^[\\s\\uFEFF\\xA0]+|[\\s\\uFEFF\\xA0]+$/g,'');}}var primitiveKey='__ec_primitive__';/**\n * Set an object as primitive to be ignored traversing children in clone or merge\n */function setAsPrimitive(obj){obj[primitiveKey]=true;}function isPrimitive(obj){return obj[primitiveKey];}/**\n * @constructor\n * @param {Object} obj Only apply `ownProperty`.\n */function HashMap(obj){var isArr=isArray(obj);// Key should not be set on this, otherwise\n// methods get/set/... may be overrided.\nthis.data={};var thisMap=this;obj instanceof HashMap?obj.each(visit):obj&&each$1(obj,visit);function visit(value,key){isArr?thisMap.set(value,key):thisMap.set(key,value);}}HashMap.prototype={constructor:HashMap,// Do not provide `has` method to avoid defining what is `has`.\n// (We usually treat `null` and `undefined` as the same, different\n// from ES6 Map).\nget:function get(key){return this.data.hasOwnProperty(key)?this.data[key]:null;},set:function set(key,value){// Comparing with invocation chaining, `return value` is more commonly\n// used in this case: `var someVal = map.set('a', genVal());`\nreturn this.data[key]=value;},// Although util.each can be performed on this hashMap directly, user\n// should not use the exposed keys, who are prefixed.\neach:function each(cb,context){context!==void 0&&(cb=bind(cb,context));/* eslint-disable guard-for-in */for(var key in this.data){this.data.hasOwnProperty(key)&&cb(this.data[key],key);}/* eslint-enable guard-for-in */},// Do not use this method if performance sensitive.\nremoveKey:function removeKey(key){delete this.data[key];}};function createHashMap(obj){return new HashMap(obj);}function concatArray(a,b){var newArray=new a.constructor(a.length+b.length);for(var i=0;i3){args=arrySlice.call(args,1);}var len=_h.length;for(var i=0;i4){args=arrySlice.call(args,1,args.length-1);}var ctx=args[args.length-1];var len=_h.length;for(var i=0;i} src source four points, [x0, y0, x1, y1, x2, y2, x3, y3]\n * @param {Array.} dest destination four points, [x0, y0, x1, y1, x2, y2, x3, y3]\n * @return {Function} transformer If fail, return null/undefined.\n */function buildTransformer(src,dest){var mA=[[src[0],src[1],1,0,0,0,-dest[0]*src[0],-dest[0]*src[1]],[0,0,0,src[0],src[1],1,-dest[1]*src[0],-dest[1]*src[1]],[src[2],src[3],1,0,0,0,-dest[2]*src[2],-dest[2]*src[3]],[0,0,0,src[2],src[3],1,-dest[3]*src[2],-dest[3]*src[3]],[src[4],src[5],1,0,0,0,-dest[4]*src[4],-dest[4]*src[5]],[0,0,0,src[4],src[5],1,-dest[5]*src[4],-dest[5]*src[5]],[src[6],src[7],1,0,0,0,-dest[6]*src[6],-dest[6]*src[7]],[0,0,0,src[6],src[7],1,-dest[7]*src[6],-dest[7]*src[7]]];var detCache={};var det=determinant(mA,8,0,0,0,detCache);if(det===0){// can not make transformer when and only when\n// any three of the markers are collinear.\nreturn;}// `invert(mA) * dest`, that is, `adj(mA) / det * dest`.\nvar vh=[];for(var i=0;i<8;i++){for(var j=0;j<8;j++){vh[j]==null&&(vh[j]=0);vh[j]+=((i+j)%2?-1:1)*// det(subMatrix(i, j))\ndeterminant(mA,7,i===0?1:0,1<} out [inX: number, inY: number] The output..\n * If can not transform, `out` will not be modified but return `false`.\n * @param {HTMLElement} elFrom The `[inX, inY]` is based on elFrom.\n * @param {HTMLElement} elTarget The `out` is based on elTarget.\n * @param {number} inX\n * @param {number} inY\n * @return {boolean} Whether transform successfully.\n */function transformLocalCoord(out,elFrom,elTarget,inX,inY){return transformCoordWithViewport(_calcOut$1,elFrom,inX,inY,true)&&transformCoordWithViewport(out,elTarget,_calcOut$1[0],_calcOut$1[1]);}/**\n * Transform between a \"viewport coord\" and a \"local coord\".\n * \"viewport coord\": the coord based on the left-top corner of the viewport\n * of the browser.\n * \"local coord\": the coord based on the input `el`. The origin point is at\n * the position of \"left: 0; top: 0;\" in the `el`.\n *\n * Support the case when CSS transform is used on el.\n *\n * @param {Array.} out [inX: number, inY: number] The output. If `inverse: false`,\n * it represents \"local coord\", otherwise \"vireport coord\".\n * If can not transform, `out` will not be modified but return `false`.\n * @param {HTMLElement} el The \"local coord\" is based on the `el`, see comment above.\n * @param {number} inX If `inverse: false`,\n * it represents \"vireport coord\", otherwise \"local coord\".\n * @param {number} inY If `inverse: false`,\n * it represents \"vireport coord\", otherwise \"local coord\".\n * @param {boolean} [inverse=false]\n * `true`: from \"viewport coord\" to \"local coord\".\n * `false`: from \"local coord\" to \"viewport coord\".\n * @return {boolean} Whether transform successfully.\n */function transformCoordWithViewport(out,el,inX,inY,inverse){if(el.getBoundingClientRect&&env$1.domSupported&&!isCanvasEl(el)){var saved=el[EVENT_SAVED_PROP]||(el[EVENT_SAVED_PROP]={});var markers=prepareCoordMarkers(el,saved);var transformer=preparePointerTransformer(markers,saved,inverse);if(transformer){transformer(out,inX,inY);return true;}}return false;}function prepareCoordMarkers(el,saved){var markers=saved.markers;if(markers){return markers;}markers=saved.markers=[];var propLR=['left','right'];var propTB=['top','bottom'];for(var i=0;i<4;i++){var marker=document.createElement('div');var stl=marker.style;var idxLR=i%2;var idxTB=(i>>1)%2;stl.cssText=['position: absolute','visibility: hidden','padding: 0','margin: 0','border-width: 0','user-select: none','width:0','height:0',// 'width: 5px',\n// 'height: 5px',\npropLR[idxLR]+':0',propTB[idxTB]+':0',propLR[1-idxLR]+':auto',propTB[1-idxTB]+':auto',''].join('!important;');el.appendChild(marker);markers.push(marker);}return markers;}function preparePointerTransformer(markers,saved,inverse){var transformerName=inverse?'invTrans':'trans';var transformer=saved[transformerName];var oldSrcCoords=saved.srcCoords;var oldCoordTheSame=true;var srcCoords=[];var destCoords=[];for(var i=0;i<4;i++){var rect=markers[i].getBoundingClientRect();var ii=2*i;var x=rect.left;var y=rect.top;srcCoords.push(x,y);oldCoordTheSame=oldCoordTheSame&&oldSrcCoords&&x===oldSrcCoords[ii]&&y===oldSrcCoords[ii+1];destCoords.push(markers[i].offsetLeft,markers[i].offsetTop);}// Cache to avoid time consuming of `buildTransformer`.\nreturn oldCoordTheSame&&transformer?transformer:(saved.srcCoords=srcCoords,saved[transformerName]=inverse?buildTransformer(destCoords,srcCoords):buildTransformer(srcCoords,destCoords));}function isCanvasEl(el){return el.nodeName.toUpperCase()==='CANVAS';}/**\n * Utilities for mouse or touch events.\n */var isDomLevel2=typeof window!=='undefined'&&!!window.addEventListener;var MOUSE_EVENT_REG=/^(?:mouse|pointer|contextmenu|drag|drop)|click/;var _calcOut=[];/**\n * Get the `zrX` and `zrY`, which are relative to the top-left of\n * the input `el`.\n * CSS transform (2D & 3D) is supported.\n *\n * The strategy to fetch the coords:\n * + If `calculate` is not set as `true`, users of this method should\n * ensure that `el` is the same or the same size & location as `e.target`.\n * Otherwise the result coords are probably not expected. Because we\n * firstly try to get coords from e.offsetX/e.offsetY.\n * + If `calculate` is set as `true`, the input `el` can be any element\n * and we force to calculate the coords based on `el`.\n * + The input `el` should be positionable (not position:static).\n *\n * The force `calculate` can be used in case like:\n * When mousemove event triggered on ec tooltip, `e.target` is not `el`(zr painter.dom).\n *\n * @param {HTMLElement} el DOM element.\n * @param {Event} e Mouse event or touch event.\n * @param {Object} out Get `out.zrX` and `out.zrY` as the result.\n * @param {boolean} [calculate=false] Whether to force calculate\n * the coordinates but not use ones provided by browser.\n */function clientToLocal(el,e,out,calculate){out=out||{};// According to the W3C Working Draft, offsetX and offsetY should be relative\n// to the padding edge of the target element. The only browser using this convention\n// is IE. Webkit uses the border edge, Opera uses the content edge, and FireFox does\n// not support the properties.\n// (see http://www.jacklmoore.com/notes/mouse-position/)\n// In zr painter.dom, padding edge equals to border edge.\nif(calculate||!env$1.canvasSupported){calculateZrXY(el,e,out);}// Caution: In FireFox, layerX/layerY Mouse position relative to the closest positioned\n// ancestor element, so we should make sure el is positioned (e.g., not position:static).\n// BTW1, Webkit don't return the same results as FF in non-simple cases (like add\n// zoom-factor, overflow / opacity layers, transforms ...)\n// BTW2, (ev.offsetY || ev.pageY - $(ev.target).offset().top) is not correct in preserve-3d.\n// \n// BTW3, In ff, offsetX/offsetY is always 0.\nelse if(env$1.browser.firefox&&e.layerX!=null&&e.layerX!==e.offsetX){out.zrX=e.layerX;out.zrY=e.layerY;}// For IE6+, chrome, safari, opera. (When will ff support offsetX?)\nelse if(e.offsetX!=null){out.zrX=e.offsetX;out.zrY=e.offsetY;}// For some other device, e.g., IOS safari.\nelse{calculateZrXY(el,e,out);}return out;}function calculateZrXY(el,e,out){// BlackBerry 5, iOS 3 (original iPhone) don't have getBoundingRect.\nif(env$1.domSupported&&el.getBoundingClientRect){var ex=e.clientX;var ey=e.clientY;if(isCanvasEl(el)){// Original approach, which do not support CSS transform.\n// marker can not be locationed in a canvas container\n// (getBoundingClientRect is always 0). We do not support\n// that input a pre-created canvas to zr while using css\n// transform in iOS.\nvar box=el.getBoundingClientRect();out.zrX=ex-box.left;out.zrY=ey-box.top;return;}else{if(transformCoordWithViewport(_calcOut,el,ex,ey)){out.zrX=_calcOut[0];out.zrY=_calcOut[1];return;}}}out.zrX=out.zrY=0;}/**\n * Find native event compat for legency IE.\n * Should be called at the begining of a native event listener.\n *\n * @param {Event} [e] Mouse event or touch event or pointer event.\n * For lagency IE, we use `window.event` is used.\n * @return {Event} The native event.\n */function getNativeEvent(e){return e||window.event;}/**\n * Normalize the coordinates of the input event.\n *\n * Get the `e.zrX` and `e.zrY`, which are relative to the top-left of\n * the input `el`.\n * Get `e.zrDelta` if using mouse wheel.\n * Get `e.which`, see the comment inside this function.\n *\n * Do not calculate repeatly if `zrX` and `zrY` already exist.\n *\n * Notice: see comments in `clientToLocal`. check the relationship\n * between the result coords and the parameters `el` and `calculate`.\n *\n * @param {HTMLElement} el DOM element.\n * @param {Event} [e] See `getNativeEvent`.\n * @param {boolean} [calculate=false] Whether to force calculate\n * the coordinates but not use ones provided by browser.\n * @return {UIEvent} The normalized native UIEvent.\n */function normalizeEvent(el,e,calculate){e=getNativeEvent(e);if(e.zrX!=null){return e;}var eventType=e.type;var isTouch=eventType&&eventType.indexOf('touch')>=0;if(!isTouch){clientToLocal(el,e,e,calculate);e.zrDelta=e.wheelDelta?e.wheelDelta/120:-(e.detail||0)/3;}else{var touch=eventType!=='touchend'?e.targetTouches[0]:e.changedTouches[0];touch&&clientToLocal(el,touch,e,calculate);}// Add which for click: 1 === left; 2 === middle; 3 === right; otherwise: 0;\n// See jQuery: https://github.com/jquery/jquery/blob/master/src/event.js\n// If e.which has been defined, it may be readonly,\n// see: https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/which\nvar button=e.button;if(e.which==null&&button!==undefined&&MOUSE_EVENT_REG.test(e.type)){e.which=button&1?1:button&2?3:button&4?2:0;}// [Caution]: `e.which` from browser is not always reliable. For example,\n// when press left button and `mousemove (pointermove)` in Edge, the `e.which`\n// is 65536 and the `e.button` is -1. But the `mouseup (pointerup)` and\n// `mousedown (pointerdown)` is the same as Chrome does.\nreturn e;}/**\n * @param {HTMLElement} el\n * @param {string} name\n * @param {Function} handler\n * @param {Object|boolean} opt If boolean, means `opt.capture`\n * @param {boolean} [opt.capture=false]\n * @param {boolean} [opt.passive=false]\n */function addEventListener(el,name,handler,opt){if(isDomLevel2){// Reproduct the console warning:\n// [Violation] Added non-passive event listener to a scroll-blocking event.\n// Consider marking event handler as 'passive' to make the page more responsive.\n// Just set console log level: verbose in chrome dev tool.\n// then the warning log will be printed when addEventListener called.\n// See https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md\n// We have not yet found a neat way to using passive. Because in zrender the dom event\n// listener delegate all of the upper events of element. Some of those events need\n// to prevent default. For example, the feature `preventDefaultMouseMove` of echarts.\n// Before passive can be adopted, these issues should be considered:\n// (1) Whether and how a zrender user specifies an event listener passive. And by default,\n// passive or not.\n// (2) How to tread that some zrender event listener is passive, and some is not. If\n// we use other way but not preventDefault of mousewheel and touchmove, browser\n// compatibility should be handled.\n// var opts = (env.passiveSupported && name === 'mousewheel')\n// ? {passive: true}\n// // By default, the third param of el.addEventListener is `capture: false`.\n// : void 0;\n// el.addEventListener(name, handler /* , opts */);\nel.addEventListener(name,handler,opt);}else{// For simplicity, do not implement `setCapture` for IE9-.\nel.attachEvent('on'+name,handler);}}/**\n * Parameter are the same as `addEventListener`.\n *\n * Notice that if a listener is registered twice, one with capture and one without,\n * remove each one separately. Removal of a capturing listener does not affect a\n * non-capturing version of the same listener, and vice versa.\n */function removeEventListener(el,name,handler,opt){if(isDomLevel2){el.removeEventListener(name,handler,opt);}else{el.detachEvent('on'+name,handler);}}/**\n * preventDefault and stopPropagation.\n * Notice: do not use this method in zrender. It can only be\n * used by upper applications if necessary.\n *\n * @param {Event} e A mouse or touch event.\n */var stop=isDomLevel2?function(e){e.preventDefault();e.stopPropagation();e.cancelBubble=true;}:function(e){e.returnValue=false;e.cancelBubble=true;};/**\n * This method only works for mouseup and mousedown. The functionality is restricted\n * for fault tolerance, See the `e.which` compatibility above.\n *\n * @param {MouseEvent} e\n * @return {boolean}\n */function isMiddleOrRightButtonOnMouseUpDown(e){return e.which===2||e.which===3;}/**\n * To be removed.\n * @deprecated\n */ /**\n * Only implements needed gestures for mobile.\n */var GestureMgr=function GestureMgr(){/**\n * @private\n * @type {Array.