From d5d0ffe7eac1207fed61f6dd816fddfe423a06b6 Mon Sep 17 00:00:00 2001
From: Stephan Porada <sporada@uni-bielefeld.de>
Date: Wed, 8 Apr 2020 09:57:18 +0200
Subject: [PATCH] sort and clean variables
---
app/templates/corpora/analyse_corpus.html.j2 | 75 +++++++++++---------
1 file changed, 41 insertions(+), 34 deletions(-)
diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2
index 10ec3bc5..f81614f9 100644
--- a/app/templates/corpora/analyse_corpus.html.j2
+++ b/app/templates/corpora/analyse_corpus.html.j2
@@ -217,36 +217,58 @@
<script src="{{ url_for('static', filename='js/nopaque.callbacks.js') }}">
</script>
<script>
- // ###### Defining global variables used in other functions ######
- var results; // results object
- var resultsJSON; // full JSON object holding match results
- var resultsList; // resultsList object
- var queryFormElement; // the query form
+// ###### Defining global variables used in other functions ######
+ var client; // CorpusAnalysisClient first undefined on DOMContentLoaded defined
+ var collapsibleElements; // All collapsibleElements on this page
var collapsibleElements; // all collapsibles on site
+ var contextModal; // Modal to open on inspect for further match context
+ var displayOptionsData; // Getting form data from display options
+ var displayOptionsFormElement; // Form holding the display informations
+ var downloadResultsJSONElement; // button for downloading results as JSON
+ var expertModeSwitchElement; // Expert mode switch Element
+ var exportModal; // Download options modal
+ var initDisplay; // CorpusAnalysisDisplay object first undfined on DOMContentLoaded defined
+ var initDisplayElement; // Element for initialization using initDisplay
+ var initModal;
+ var matchCountElement; // Total nr. of matches will be displayed in this element
var progress; // global progress value
- var queryResultsProgressElement; // Div element holding the progress bar
+ var queryDisplay; // CorpusAnalysisDisplay object first undfined on DOMContentLoaded defined
+ var queryDisplayElement; // Element for initialization using queryDisplay
+ var queryFormElement; // the query form
var queryResultsDeterminateElement; // The progress bar for recieved results
- var queryResultsUserFeedbackElement; // Element showing match count|total etc
var queryResultsExportElement; // Download button opens download modal
- var exportModal; // Download options modal
- var contextModal; // Modal to open on inspect for further match context
- var initModal;
- var downloadResultsJSONElement; // button for downloading results as JSON
- var displayOptionsFormElement;
+ var queryResultsProgressElement; // Div element holding the progress bar
+ var queryResultsUserFeedbackElement; // Element showing match count|total etc
+ var receivedMatchCountElement; // Nr. of loaded matches will be displayed in this element
+ var results; // results object
+ var resultsJSON; // full JSON object holding match results
+ var resultsList; // resultsList object
+ var resultsListOptions; // specifies ResultsList options
+ var textLookupCountElement // Nr of texts the matches occured in will be shown in this element
// ###### Initialize variables ######
+ client = undefined;
+ collapsibleElements = document.querySelector('.collapsible.expandable');
contextModal = document.getElementById("context-modal");
+ displayOptionsFormElement = document.getElementById("display-options-form");
+ expertModeSwitchElement = document.getElementById("display-options-form-expert_mode");
exportModal = document.getElementById("query-results-download-modal");
+ initDisplay = undefined;
+ initDisplayElement = document.getElementById("init-display");
+ matchCountElement = document.getElementById("match-count");
+ queryDisplay = undefined;
+ queryDisplayElement = document.getElementById("query-display");
queryFormElement = document.getElementById("query-form");
- queryResultsProgressElement = document.getElementById("query-results-progress");
queryResultsDeterminateElement = document.getElementById("query-results-determinate");
- queryResultsUserFeedbackElement = document.getElementById("query-results-user-feedback");
queryResultsExportElement = document.getElementById("query-results-export");
- displayOptionsFormElement = document.getElementById("display-options-form");
+ queryResultsProgressElement = document.getElementById("query-results-progress");
+ queryResultsUserFeedbackElement = document.getElementById("query-results-user-feedback");
+ receivedMatchCountElement = document.getElementById("received-match-count");
+ textLookupCountElement = document.getElementById("text-lookup-count");
- // js list options and intialization
- let displayOptionsData = ResultsList.getDisplayOptions(displayOptionsFormElement);
- let resultsListOptions = {page: displayOptionsData["resultsPerPage"],
+ // ###### js list options and intialization ######
+ displayOptionsData = ResultsList.getDisplayOptions(displayOptionsFormElement);
+ resultsListOptions = {page: displayOptionsData["resultsPerPage"],
pagination: [{
name: "paginationTop",
paginationClass: "paginationTop",
@@ -260,23 +282,8 @@
valueNames: ["titles", "lc", "c", "rc", {data: ["index"]}],
item: `<span></span>`};
- // ###### Set some css options ######
- // get collapsibles to alter options of those
- var collapsibleElements = document.querySelector('.collapsible.expandable');
-
-
- var client = undefined;
- var initDisplay = undefined;
- var queryDisplay = undefined;
-
- var initDisplayElement = document.getElementById("init-display");
- var queryDisplayElement = document.getElementById("query-display");
- receivedMatchCountElement = document.getElementById("received-match-count");
- matchCountElement = document.getElementById("match-count");
- textLookupCountElement = document.getElementById("text-lookup-count");
- var expertModeSwitchElement = document.getElementById("display-options-form-expert_mode");
-
+ // ###### event on DOMContentLoaded ######
document.addEventListener("DOMContentLoaded", () => {
//set accordion of collapsibles to false
M.Collapsible.init(collapsibleElements, {accordion: false});
--
GitLab