);
}
@@ -108,6 +109,7 @@ GameArea.propTypes = {
resetTableCreator: PropTypes.func.isRequired,
tableCreatorModalSelector: PropTypes.string.isRequired,
listName: PropTypes.string.isRequired,
+ hideErrors: PropTypes.bool.isRequired,
handleStart: PropTypes.func.isRequired,
};
diff --git a/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/challenge_results.jsx b/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/challenge_results.jsx
index 5c1cfd3a..d842d5e3 100644
--- a/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/challenge_results.jsx
+++ b/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/challenge_results.jsx
@@ -43,16 +43,24 @@ class ChallengeResults extends React.Component {
const { maxScore } = this.props.challengeData;
this.props.challengeData.entries.forEach((entry, index) => {
const userLink = ChallengeResults.getUserLink(entry.user, entry.addl);
+ let errorsColumn = null;
+ if (!this.props.hideErrors) {
+ errorsColumn =
);
entries.push(entryTr);
});
+ let errorsHeader = null;
+ if (!this.props.hideErrors) {
+ errorsHeader =
#
User |
Score |
-
Errors |
+ {errorsHeader}
Rem. |
@@ -93,6 +101,7 @@ ChallengeResults.propTypes = {
lexicon: PropTypes.string,
maxScore: PropTypes.number,
}).isRequired,
+ hideErrors: PropTypes.bool.isRequired,
height: PropTypes.number.isRequired,
};
diff --git a/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog.jsx b/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog.jsx
index b3c20bed..d6553546 100644
--- a/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog.jsx
+++ b/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog.jsx
@@ -95,6 +95,7 @@ const ChallengeDialog = (props) => {
@@ -129,6 +130,7 @@ ChallengeDialog.propTypes = {
lexicon: PropTypes.string,
maxScore: PropTypes.number,
}).isRequired,
+ hideErrors: PropTypes.bool.isRequired,
specialChallengeInfo: PropTypes.arrayOf(PropTypes.shape({
id: PropTypes.number,
seconds: PropTypes.number,
diff --git a/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog_container.jsx b/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog_container.jsx
index 69c5fe99..8450b1fb 100644
--- a/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog_container.jsx
+++ b/djAerolith/wordwalls/static/js/wordwalls/newtable/challenges/dialog_container.jsx
@@ -68,6 +68,7 @@ class ChallengeDialogContainer extends React.Component {
lexicon: this.props.lexicon,
date: this.state.currentDate.format(DATE_FORMAT_STRING),
challenge: this.state.currentChallenge,
+ tiebreaker: this.props.hideErrors ? 'time' : 'errors',
}, 'GET')
.then(data => this.setState({
challengeLeaderboardData: data || {},
@@ -128,6 +129,7 @@ class ChallengeDialogContainer extends React.Component {
currentChallenge={this.state.currentChallenge}
challengesDoneAtDate={this.state.challengesDoneAtDate}
challengeLeaderboardData={this.state.challengeLeaderboardData}
+ hideErrors={this.props.hideErrors}
specialChallengeInfo={this.state.specialChallengeInfo}
onDateChange={(date) => {
this.setState({
@@ -152,6 +154,7 @@ ChallengeDialogContainer.propTypes = {
})).isRequired,
showSpinner: PropTypes.func.isRequired,
hideSpinner: PropTypes.func.isRequired,
+ hideErrors: PropTypes.bool.isRequired,
api: PropTypes.instanceOf(WordwallsAPI).isRequired,
setTimeAndQuestions: PropTypes.func.isRequired,
tablenum: PropTypes.number.isRequired,
diff --git a/djAerolith/wordwalls/static/js/wordwalls/newtable/table_creator.jsx b/djAerolith/wordwalls/static/js/wordwalls/newtable/table_creator.jsx
index 23180bf7..f7d87ba1 100644
--- a/djAerolith/wordwalls/static/js/wordwalls/newtable/table_creator.jsx
+++ b/djAerolith/wordwalls/static/js/wordwalls/newtable/table_creator.jsx
@@ -385,6 +385,7 @@ class TableCreator extends React.Component {
tablenum={this.props.tablenum}
onLoadNewList={this.props.onLoadNewList}
challengeInfo={this.props.challengeInfo}
+ hideErrors={this.props.hideErrors}
showSpinner={this.showSpinner}
hideSpinner={this.hideSpinner}
lexicon={this.state.currentLexicon}
@@ -569,6 +570,7 @@ TableCreator.propTypes = {
onLoadNewList: PropTypes.func.isRequired,
gameGoing: PropTypes.bool.isRequired,
setLoadingData: PropTypes.func.isRequired,
+ hideErrors: PropTypes.bool.isRequired,
};
diff --git a/djAerolith/wordwalls/static/js/wordwalls/style.js b/djAerolith/wordwalls/static/js/wordwalls/style.js
index 2e32deb4..ca2245c3 100644
--- a/djAerolith/wordwalls/static/js/wordwalls/style.js
+++ b/djAerolith/wordwalls/static/js/wordwalls/style.js
@@ -40,6 +40,7 @@ class Styling {
style.bc.upscaleWithWindowSize = 'small';
}
style.bc.requireOctothorp = style.bc.requireOctothorp || false;
+ style.bc.hideErrors = style.bc.hideErrors || false;
} else {
// Default style.
style = {
@@ -61,6 +62,7 @@ class Styling {
hideLexiconSymbols: false,
upscaleWithWindowSize: 'small',
requireOctothorp: false,
+ hideErrors: false,
},
};
}
@@ -133,6 +135,10 @@ class Styling {
return this.style.getIn(['bc', 'requireOctothorp']);
}
+ get hideErrors() {
+ return this.style.getIn(['bc', 'hideErrors']);
+ }
+
// get randomTileOrientation() {
// return this.style.getIn(['tc', 'randomTileOrientation']);
// }
@@ -161,6 +167,7 @@ class Styling {
bodyBackground: ['bc', 'bodyBackground'],
upscaleWithWindowSize: ['bc', 'upscaleWithWindowSize'],
requireOctothorp: ['bc', 'requireOctothorp'],
+ hideErrors: ['bc', 'hideErrors'],
};
if (!treeKeys[key]) {
throw new Error(`The key ${key} was not found in the tree.`);
diff --git a/djAerolith/wordwalls/static/js/wordwalls/topbar/wordwalls_settings.jsx b/djAerolith/wordwalls/static/js/wordwalls/topbar/wordwalls_settings.jsx
index 9a838840..ffb76b68 100644
--- a/djAerolith/wordwalls/static/js/wordwalls/topbar/wordwalls_settings.jsx
+++ b/djAerolith/wordwalls/static/js/wordwalls/topbar/wordwalls_settings.jsx
@@ -359,6 +359,21 @@ class WordwallsSettings extends React.Component {