Skip to content

Commit

Permalink
disable spellcheck for imported third party module and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
pygeek committed Sep 11, 2024
1 parent 518f602 commit 3a1dc4d
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 10 deletions.
1 change: 0 additions & 1 deletion Gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import fs from "fs";
import gulp from "gulp";
import path from "path";
import livereload from "gulp-livereload";

import stylus from "gulp-stylus";
import sourcemaps from "gulp-sourcemaps";
import rename from "gulp-rename";
Expand Down
3 changes: 2 additions & 1 deletion src/components/Markdown/Markdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

import * as React from "react";
import markdownit from "markdown-it";
import markdownit from "markdown-it"; // cspell:disable-line
import sanitizeHtml from "sanitize-html";
//import moment from "moment";
import { profanity_filter } from "@/lib/profanity_filter";
Expand All @@ -29,6 +29,7 @@ interface MarkdownProps {

interface MarkdownState {}

// cspell:disable-next-line
const md = markdownit({
html: true,
linkify: true,
Expand Down
11 changes: 7 additions & 4 deletions src/components/PaginatedTable/PaginatedTable.styl
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,18 @@
margin-top: 1rem;

.left {
display: inline-block;
display: flex;
flex:1;
align-items: center;
input {
//font-size: 0.7em;
padding: 0;
width: 2rem;
text-align: left;
text-align: right;
border: 0;
margin-left: 0.5rem;
margin-left: 0.25rem;
margin-right: 0.5rem;
outline: none;
//border-bottom: 1px solid;
//background-color: transparent;
//themed color fg
Expand All @@ -127,7 +130,7 @@
//font-size: 0.7em;
min-width: 0.8rem;
text-align: right;
margin-right: 0.5rem;
margin-right: 1rem;
}

.fa {
Expand Down
2 changes: 1 addition & 1 deletion src/ogs.styl
Original file line number Diff line number Diff line change
Expand Up @@ -590,4 +590,4 @@ nowrap()
.react-tabs__tab-panel--selected {
display: block;
padding: 10px;
}
}
22 changes: 20 additions & 2 deletions src/views/User/GameHistoryTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,27 @@ export function GameHistoryTable(props: GameHistoryProps) {
function handleRowClick(
row: GroomedGame,
ev: React.MouseEvent | React.TouchEvent | React.PointerEvent,
rows: GroomedGame[],
) {
if (row.annulled) {
return;
}

if (selectModeActive) {
toggleQueued(row);
if (ev.shiftKey) {
if (annulQueue.at(-1)) {
window.getSelection()?.removeAllRanges();
const indexes = [
rows.findIndex((r) => r.id === annulQueue.at(-1).id),
rows.findIndex((r) => r.id === row.id),
];
const minIndex = Math.min(...indexes);
const maxIndex = Math.max(...indexes);
setAnnulQueue(rows.slice(minIndex, maxIndex + 1).filter((r) => !r.annulled));
}
} else {
toggleQueued(row);
}
} else {
openUrlIfALinkWasNotClicked(ev, row.href);
}
Expand Down Expand Up @@ -336,7 +354,7 @@ export function GameHistoryTable(props: GameHistoryProps) {
groom={game_history_groomer}
pageSizeOptions={[10, 15, 25, 50]}
onRowClick={handleRowClick}
annulQueue={annulQueue}
highlightedRows={annulQueue}
columns={[
{
header: _("User"),
Expand Down
1 change: 0 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"lib": ["es2015", "dom"],
"skipLibCheck": true,
"baseUrl": ".",
"paths": {
"@/*": ["src/*"],
Expand Down

0 comments on commit 3a1dc4d

Please sign in to comment.