Caja: Fix default format for formatselect element

smogon · Oct 2, 2023 · 1974428 · 1974428
1 parent 82ca9ec
commit 1974428
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/js/client.js b/js/client.js
@@ -2154,7 +2154,8 @@ function toId() {
 		 * Used for <formatselect>, does format popup and caches value in button value
 		 */
 		selectformat: function (value, target) {
-			app.addPopup(FormatPopup, {format: 'gen9randombattle', sourceEl: target, selectType: 'watch', onselect: function (newFormat) {
+			var format = value || 'gen9randombattle';
+			app.addPopup(FormatPopup, {format: format, sourceEl: target, selectType: 'watch', onselect: function (newFormat) {
 				target.value = newFormat;
 			}});
 		},

diff --git a/src/battle-log.ts b/src/battle-log.ts
@@ -922,7 +922,7 @@ export class BattleLog {
 					attribs: [
 						'type', 'selectformat',
 						'class', "select formatselect",
-						'value', getAttrib('value') || "gen9randombattle",
+						'value', getAttrib('format') || getAttrib('value') || '',
 						'name', getAttrib('name') || '',
 					],
 				};