diff --git a/assets/js/iframes/analysis/index.js b/assets/js/iframes/analysis/index.js index b15d2306..689e1bd0 100644 --- a/assets/js/iframes/analysis/index.js +++ b/assets/js/iframes/analysis/index.js @@ -17,6 +17,6 @@ analysisWebSocket.send('/start', { settings: { fen: decodeURIComponent(url[7]), movetext: decodeURIComponent(url[8]), - startPos: url[9] + shuffle: url[9] } }); diff --git a/assets/js/iframes/annotations/index.js b/assets/js/iframes/annotations/index.js index a335e61b..4dd9c528 100644 --- a/assets/js/iframes/annotations/index.js +++ b/assets/js/iframes/annotations/index.js @@ -14,5 +14,5 @@ analysisWebSocket.send('/play_rav', { variant: url[6], fen: decodeURIComponent(url[7]), movetext: decodeURIComponent(url[8]), - startPos: url[9] + shuffle: url[9] }); diff --git a/assets/js/pages/SanForm.js b/assets/js/pages/SanForm.js index 209d9e04..ec529cfd 100644 --- a/assets/js/pages/SanForm.js +++ b/assets/js/pages/SanForm.js @@ -22,8 +22,8 @@ export class SanForm extends BaseComponent { if (this.el) { this.props.variantSelect.addEventListener('change', event => { event.target.value === variant.CHESS_960 - ? this.el.querySelector('.startPos').classList.remove('d-none') - : this.el.querySelector('.startPos').classList.add('d-none'); + ? 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 @@ -47,7 +47,7 @@ export class SanForm extends BaseComponent { settings: { fen: event.target.fen.value, movetext: Movetext.notation(NOTATION_SAN, event.target.san.value), - ...(event.target.startPos.value && {startPos: event.target.startPos.value}) + ...(event.target.shuffle.value && {shuffle: event.target.shuffle.value}) } }); }); @@ -62,7 +62,7 @@ export const sanForm = new SanForm({ variantSelect: this.el.querySelector('select[name="variant"]'), fenInput: this.el.querySelector('input[name="fen"]'), chessboardInput: this.el.querySelector('input[name="chessboard"]'), - startPosInput: this.el.querySelector('input[name="startPos"]') + shuffleInput: this.el.querySelector('input[name="shuffle"]') }); } }); diff --git a/assets/js/pages/annotations/index.js b/assets/js/pages/annotations/index.js index b0f26deb..70b95363 100644 --- a/assets/js/pages/annotations/index.js +++ b/assets/js/pages/annotations/index.js @@ -8,8 +8,8 @@ class RavForm extends BaseComponent { mount() { this.el.querySelector('select').addEventListener('change', event => { event.target.value === variant.CHESS_960 - ? this.el.querySelector('.startPos').classList.remove('d-none') - : this.el.querySelector('.startPos').classList.add('d-none'); + ? this.el.querySelector('.shuffle').classList.remove('d-none') + : this.el.querySelector('.shuffle').classList.add('d-none'); }); this.el.addEventListener('submit', async event => { event.preventDefault(); diff --git a/assets/js/pages/play/online/PlayFriendModal.js b/assets/js/pages/play/online/PlayFriendModal.js index c0c18d55..e1a6f26f 100644 --- a/assets/js/pages/play/online/PlayFriendModal.js +++ b/assets/js/pages/play/online/PlayFriendModal.js @@ -10,8 +10,8 @@ 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('.startPos').classList.remove('d-none') - : this.props.form.querySelector('.startPos').classList.add('d-none'); + ? this.props.form.querySelector('.shuffle').classList.remove('d-none') + : this.props.form.querySelector('.shuffle').classList.add('d-none'); }); this.props.form.addEventListener('submit', event => { @@ -26,7 +26,7 @@ export class PlayFriendModal extends BaseComponent { increment: formData.get('increment'), color: formData.get('color'), submode: mode.SUBMODE_FRIEND, - ...(formData.get('variant') === variant.CHESS_960) && {startPos: formData.get('startPos')}, + ...(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 9c7a44d1..d4e552e5 100644 --- a/assets/js/websockets/game/AnalysisWebSocket.js +++ b/assets/js/websockets/game/AnalysisWebSocket.js @@ -14,7 +14,7 @@ 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.startPos = data.startPos; + 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 +24,7 @@ export class AnalysisWebSocket extends AbstractGameWebSocket { analysisPanel.props.openingTable.mount(); if (sanForm.el) { sanForm.props.fenInput.value = data.fen[0]; - sanForm.props.startPosInput.value = data?.startPos ?? ''; + 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 55876e1f..3905b6bd 100644 --- a/assets/js/websockets/game/PlayWebSocket.js +++ b/assets/js/websockets/game/PlayWebSocket.js @@ -29,7 +29,7 @@ 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.startPos = data.startPos; + 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 4e531f1c..0b284cc5 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}/{startPos} + path: /{_locale}/iframe/analysis/{variant}/{fen}/{movetext}/{shuffle} 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}/{startPos} + path: /{_locale}/iframe/annotations/{variant}/{fen}/{movetext}/{shuffle} controller: App\Controller\Iframes\AnnotationsController::index methods: GET requirements: diff --git a/docs/html-iframes.md b/docs/html-iframes.md index 595ee8f2..99628092 100644 --- a/docs/html-iframes.md +++ b/docs/html-iframes.md @@ -40,7 +40,7 @@ An URL-encoded FEN string. An URL-encoded movetext in SAN format. -#### `startPos` (optional) +#### `shuffle` (optional) The start position in a Chess960 game; for example `BRNNKBRQ`. @@ -82,6 +82,6 @@ An URL-encoded FEN string. An URL-encoded movetext in RAV format. -#### `startPos` (optional) +#### `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 494e8a0f..dde50bf0 100644 --- a/templates/pages/annotations/rav_form.html.twig +++ b/templates/pages/annotations/rav_form.html.twig @@ -6,9 +6,9 @@ -
+
- + Example: RNBQKBNR
diff --git a/templates/pages/home/san_form.html.twig b/templates/pages/home/san_form.html.twig index a7f6fb3a..7f85b84f 100644 --- a/templates/pages/home/san_form.html.twig +++ b/templates/pages/home/san_form.html.twig @@ -9,8 +9,8 @@
-
- +
+ Example: RNBQKBNR
diff --git a/templates/pages/play/online/friend_modal.html.twig b/templates/pages/play/online/friend_modal.html.twig index 73914970..38696f05 100644 --- a/templates/pages/play/online/friend_modal.html.twig +++ b/templates/pages/play/online/friend_modal.html.twig @@ -39,8 +39,8 @@
-
- +
+ Example: RNBQKBNR