From 2bbfa6b69088faa55b063ac2e67b8b282fe24b85 Mon Sep 17 00:00:00 2001 From: standard Date: Mon, 17 Feb 2025 19:38:42 +0100 Subject: [PATCH] Deleted shuffle --- assets/js/iframes/analysis/index.js | 3 +-- assets/js/iframes/annotations/index.js | 3 +-- assets/js/pages/SanForm.js | 9 ++------- assets/js/pages/annotations/index.js | 5 ----- assets/js/pages/play/online/PlayFriendModal.js | 7 ------- assets/js/websockets/game/AnalysisWebSocket.js | 2 -- assets/js/websockets/game/PlayWebSocket.js | 1 - config/routes.yaml | 4 ++-- docs/html-iframes.md | 8 -------- templates/pages/annotations/rav_form.html.twig | 5 ----- templates/pages/home/san_form.html.twig | 4 ---- templates/pages/play/online/friend_modal.html.twig | 4 ---- 12 files changed, 6 insertions(+), 49 deletions(-) diff --git a/assets/js/iframes/analysis/index.js b/assets/js/iframes/analysis/index.js index 689e1bd0..1246568d 100644 --- a/assets/js/iframes/analysis/index.js +++ b/assets/js/iframes/analysis/index.js @@ -16,7 +16,6 @@ analysisWebSocket.send('/start', { mode: mode.ANALYSIS, settings: { fen: decodeURIComponent(url[7]), - movetext: decodeURIComponent(url[8]), - shuffle: url[9] + movetext: decodeURIComponent(url[8]) } }); diff --git a/assets/js/iframes/annotations/index.js b/assets/js/iframes/annotations/index.js index 4dd9c528..e4667827 100644 --- a/assets/js/iframes/annotations/index.js +++ b/assets/js/iframes/annotations/index.js @@ -13,6 +13,5 @@ const url = window.location.href.split('/'); analysisWebSocket.send('/play_rav', { variant: url[6], fen: decodeURIComponent(url[7]), - movetext: decodeURIComponent(url[8]), - shuffle: url[9] + movetext: decodeURIComponent(url[8]) }); diff --git a/assets/js/pages/SanForm.js b/assets/js/pages/SanForm.js index ec529cfd..a57be26c 100644 --- a/assets/js/pages/SanForm.js +++ b/assets/js/pages/SanForm.js @@ -21,9 +21,6 @@ export class SanForm extends BaseComponent { mount() { if (this.el) { this.props.variantSelect.addEventListener('change', event => { - event.target.value === variant.CHESS_960 - ? this.el.querySelector('.shuffle').classList.remove('d-none') - : this.el.querySelector('.shuffle').classList.add('d-none'); analysisWebSocket.send('/start', { variant: event.target.value, mode: mode.ANALYSIS @@ -46,8 +43,7 @@ export class SanForm extends BaseComponent { mode: mode.ANALYSIS, settings: { fen: event.target.fen.value, - movetext: Movetext.notation(NOTATION_SAN, event.target.san.value), - ...(event.target.shuffle.value && {shuffle: event.target.shuffle.value}) + movetext: Movetext.notation(NOTATION_SAN, event.target.san.value) } }); }); @@ -61,8 +57,7 @@ export const sanForm = new SanForm({ return({ variantSelect: this.el.querySelector('select[name="variant"]'), fenInput: this.el.querySelector('input[name="fen"]'), - chessboardInput: this.el.querySelector('input[name="chessboard"]'), - shuffleInput: this.el.querySelector('input[name="shuffle"]') + chessboardInput: this.el.querySelector('input[name="chessboard"]') }); } }); diff --git a/assets/js/pages/annotations/index.js b/assets/js/pages/annotations/index.js index 70b95363..e3334266 100644 --- a/assets/js/pages/annotations/index.js +++ b/assets/js/pages/annotations/index.js @@ -6,11 +6,6 @@ import * as variant from '../../../variant.js'; class RavForm extends BaseComponent { mount() { - this.el.querySelector('select').addEventListener('change', event => { - event.target.value === variant.CHESS_960 - ? this.el.querySelector('.shuffle').classList.remove('d-none') - : this.el.querySelector('.shuffle').classList.add('d-none'); - }); this.el.addEventListener('submit', async event => { event.preventDefault(); this.progressModal.props.modal.show(); diff --git a/assets/js/pages/play/online/PlayFriendModal.js b/assets/js/pages/play/online/PlayFriendModal.js index e1a6f26f..eb0b74d7 100644 --- a/assets/js/pages/play/online/PlayFriendModal.js +++ b/assets/js/pages/play/online/PlayFriendModal.js @@ -8,12 +8,6 @@ import * as variant from '../../../../variant.js'; export class PlayFriendModal extends BaseComponent { mount() { - this.props.form.querySelector('select[name="variant"]').addEventListener('change', event => { - event.target.value === variant.CHESS_960 - ? this.props.form.querySelector('.shuffle').classList.remove('d-none') - : this.props.form.querySelector('.shuffle').classList.add('d-none'); - }); - this.props.form.addEventListener('submit', event => { event.preventDefault(); const accessToken = jsCookie.get('access_token') ? jwtDecode(jsCookie.get('access_token')) : null; @@ -26,7 +20,6 @@ export class PlayFriendModal extends BaseComponent { increment: formData.get('increment'), color: formData.get('color'), submode: mode.SUBMODE_FRIEND, - ...(formData.get('variant') === variant.CHESS_960) && {shuffle: formData.get('shuffle')}, ...(formData.get('fen') && {fen: formData.get('fen')}), username: accessToken ? accessToken.username : null, elo: accessToken ? accessToken.elo : null diff --git a/assets/js/websockets/game/AnalysisWebSocket.js b/assets/js/websockets/game/AnalysisWebSocket.js index d4e552e5..b4511337 100644 --- a/assets/js/websockets/game/AnalysisWebSocket.js +++ b/assets/js/websockets/game/AnalysisWebSocket.js @@ -14,7 +14,6 @@ export class AnalysisWebSocket extends AbstractGameWebSocket { this.chessboard.enableMoveInput(event => this.inputHandler(event)); this.chessboard.setPosition(data.fen[data.fen.length - 1], true); this.chessboard.props.variant = data.variant; - this.chessboard.props.shuffle = data.shuffle; analysisPanel.props.movesBrowser.current = data.fen.length - 1; analysisPanel.props.movesBrowser.props.movetext = Movetext.notation(localStorage.getItem('notation'), data.movetext); @@ -24,7 +23,6 @@ export class AnalysisWebSocket extends AbstractGameWebSocket { analysisPanel.props.openingTable.mount(); if (sanForm.el) { sanForm.props.fenInput.value = data.fen[0]; - sanForm.props.shuffleInput.value = data?.shuffle ?? ''; } } else { this.infoModal.props.msg = "This game could not be started, please try again"; diff --git a/assets/js/websockets/game/PlayWebSocket.js b/assets/js/websockets/game/PlayWebSocket.js index 3905b6bd..99c29cc4 100644 --- a/assets/js/websockets/game/PlayWebSocket.js +++ b/assets/js/websockets/game/PlayWebSocket.js @@ -29,7 +29,6 @@ export class PlayWebSocket extends AbstractGameWebSocket { this.chessboard.setPosition(data.fen, true); this.chessboard.setOrientation(startToken.color); this.chessboard.props.variant = data.variant; - this.chessboard.props.shuffle = data.shuffle; createGameModal.props.modal.hide(); this.send('/online_games'); sessionStorage.setItem('start_token', data.jwt); diff --git a/config/routes.yaml b/config/routes.yaml index 0b284cc5..7097d14b 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -125,7 +125,7 @@ pages_about: # Iframe routes iframe_analysis: - path: /{_locale}/iframe/analysis/{variant}/{fen}/{movetext}/{shuffle} + path: /{_locale}/iframe/analysis/{variant}/{fen}/{movetext} controller: App\Controller\Iframes\AnalysisController::index methods: GET requirements: @@ -133,7 +133,7 @@ iframe_analysis: _locale: en|es|fr|ru|tr|de|hi|zh_CN iframe_annotations: - path: /{_locale}/iframe/annotations/{variant}/{fen}/{movetext}/{shuffle} + path: /{_locale}/iframe/annotations/{variant}/{fen}/{movetext} controller: App\Controller\Iframes\AnnotationsController::index methods: GET requirements: diff --git a/docs/html-iframes.md b/docs/html-iframes.md index 99628092..ff8bba80 100644 --- a/docs/html-iframes.md +++ b/docs/html-iframes.md @@ -40,10 +40,6 @@ An URL-encoded FEN string. An URL-encoded movetext in SAN format. -#### `shuffle` (optional) - -The start position in a Chess960 game; for example `BRNNKBRQ`. - ## Annotations Board Add the following sample HTML code to your blog post: @@ -81,7 +77,3 @@ An URL-encoded FEN string. #### `movetext` An URL-encoded movetext in RAV format. - -#### `shuffle` (optional) - -The start position in a Chess960 game; for example `BRNNKBRQ`. diff --git a/templates/pages/annotations/rav_form.html.twig b/templates/pages/annotations/rav_form.html.twig index dde50bf0..b21a1eb9 100644 --- a/templates/pages/annotations/rav_form.html.twig +++ b/templates/pages/annotations/rav_form.html.twig @@ -6,11 +6,6 @@ -
- - - Example: RNBQKBNR -
diff --git a/templates/pages/home/san_form.html.twig b/templates/pages/home/san_form.html.twig index 7f85b84f..df55746c 100644 --- a/templates/pages/home/san_form.html.twig +++ b/templates/pages/home/san_form.html.twig @@ -9,10 +9,6 @@ -
- - Example: RNBQKBNR -
diff --git a/templates/pages/play/online/friend_modal.html.twig b/templates/pages/play/online/friend_modal.html.twig index 38696f05..c6ba7b76 100644 --- a/templates/pages/play/online/friend_modal.html.twig +++ b/templates/pages/play/online/friend_modal.html.twig @@ -39,10 +39,6 @@ -
- - Example: RNBQKBNR -