Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overhaul the format selector to be more easily used #2168

Merged
merged 3 commits into from
Oct 24, 2023
Merged

Overhaul the format selector to be more easily used #2168

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3945e54
Overhaul the format selector to be more easily used
mia-pi-git Oct 23, 2023
ee23625
Update js/client-mainmenu.js
mia-pi-git Oct 23, 2023
34e6193
Lower search pop open limit
mia-pi-git Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 48 additions & 5 deletions js/client-mainmenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,16 +1224,42 @@
});

var FormatPopup = this.FormatPopup = this.Popup.extend({
events: {
'keyup input': 'updateSearch',
'click details': 'updateOpen',
},
initialize: function (data) {
var curFormat = data.format;
this.data = data;
if (!this.open) {
// todo: maybe make this configurable? not sure since it will cache what users toggle.
// avoiding that decision for now because it requires either an ugly hack
// or an overhaul of BattleFormats.
this.open = Storage.prefs('openformats') || {
"S/V Singles": true, "S/V Doubles": true, "National Dex": true, "OM of the Month": true,
"Other Metagames": true, "Randomized Format Spotlight": true, "RoA Spotlight": true,
};
}
if (!this.search) this.search = "";
this.onselect = data.onselect;

var html = '<p><ul class="popupmenu"><li><input placeholder="Search formats" value="' + this.search + '"/>';
html += '</li></ul></p><span name="formats">';
html += this.renderFormats();
html += '</span><div style="clear:left"></div><p></p>';
this.$el.html(html);
},
renderFormats: function () {
var data = this.data;
var curFormat = data.format;
var selectType = data.selectType;
if (!selectType) selectType = (this.sourceEl.closest('form').data('search') ? 'search' : 'challenge');

var bufs = [];
var curBuf = 0;
if (selectType === 'watch') {
bufs[1] = '<li><button name="selectFormat" value=""' + (curFormat === '' ? ' class="sel"' : '') + '>(All formats)</button></li>';
}

var curSection = '';
for (var i in BattleFormats) {
var format = BattleFormats[i];
Expand All @@ -1245,6 +1271,7 @@
}

if (format.section && format.section !== curSection) {
if (curSection) bufs[curBuf] += '</details></p>';
curSection = format.section;
if (!app.supports['formatColumns']) {
curBuf = (curSection === 'Doubles' || curSection === 'Past Generations') ? 2 : 1;
Expand All @@ -1254,17 +1281,20 @@
if (!bufs[curBuf]) {
bufs[curBuf] = '';
}
bufs[curBuf] += '<li><h3>' + BattleLog.escapeHTML(curSection) + '</li>';
var open = (this.open[curSection] || toID(this.search)) ? ' open' : '';
bufs[curBuf] += '<p><details' + open + ' section="' + curSection + '">';
bufs[curBuf] += '<summary><strong style="color: #579">';
bufs[curBuf] += BattleLog.escapeHTML(curSection) + '</strong></summary>';
}
var formatName = BattleLog.escapeFormat(format.id);
if (this.search && !format.id.includes(toID(this.search))) continue;
if (formatName.charAt(0) !== '[') formatName = '[Gen 6] ' + formatName;
formatName = formatName.replace('[Gen 9] ', '');
formatName = formatName.replace('[Gen 9 ', '[');
formatName = formatName.replace('[Gen 8 ', '[');
formatName = formatName.replace('[Gen 7 ', '[');
bufs[curBuf] += '<li><button name="selectFormat" value="' + i + '"' + (curFormat === i ? ' class="sel"' : '') + '>' + formatName + '</button></li>';
}

var html = '';
for (var i = 1, l = bufs.length; i < l; i++) {
html += '<ul class="popupmenu"';
Expand All @@ -1277,8 +1307,21 @@
}
html += '>' + bufs[i] + '</ul>';
}
html += '<div style="clear:left"></div>';
this.$el.html(html);
return html;
},
update: function () {
var $formatEl = this.$el.find('span[name=formats]');
$formatEl.empty();
$formatEl.html(this.renderFormats());
},
updateOpen: function (ev) {
var section = $(ev.currentTarget).attr('section');
this.open[section] = !this.open[section];
Storage.prefs('openformats', this.open);
},
updateSearch: function (event) {
this.search = $(event.currentTarget).val();
this.update();
},
selectFormat: function (format) {
if (this.onselect) {
Expand Down
Loading