Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-03-11 21:27:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

NONE_EXTRA_VALUE moved to constants

Browse source
This commit is contained in:
nklhrstv 2020-03-27 11:17:29 +02:00
parent 178446fcfb
commit a4b7fb1fd6
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/CONSTANTS.js
View file

@ -2,10 +2,12 @@ const SUBTITLES_SIZES = [75, 100, 125, 150, 175, 200, 250];
const SUBTITLES_FONTS = ['Roboto', 'Arial', 'Halvetica', 'Times New Roman', 'Verdana', 'Courier', 'Lucida Console', 'sans-serif', 'serif', 'monospace'];
const CATALOG_PREVIEW_SIZE = 10;
const CATALOG_PAGE_SIZE = 100;
const NONE_EXTRA_VALUE = 'None';
module.exports = {
SUBTITLES_SIZES,
SUBTITLES_FONTS,
CATALOG_PREVIEW_SIZE,
CATALOG_PAGE_SIZE
CATALOG_PAGE_SIZE,
NONE_EXTRA_VALUE
};

19
src/routes/Discover/useSelectableInputs.js
View file

@ -1,7 +1,6 @@
const React = require('react');
const { CONSTANTS } = require('stremio/common');
const NONE_EXTRA_VALUE = 'None';
const CATALOG_PAGE_SIZE = 100;
const SKIP_EXTRA = {
name: 'skip',
optionsLimit: 1,
@ -21,7 +20,7 @@ const getNextExtra = (prevExtra, extraProp, extraValue) => {
.concat([[extraProp.name, extraValue]])
.reduceRight((result, [name, value]) => {
if (extraProp.name === name) {
if (extraValue !== NONE_EXTRA_VALUE) {
if (extraValue !== CONSTANTS.NONE_EXTRA_VALUE) {
const optionsCount = result.reduce((optionsCount, [name]) => {
if (extraProp.name === name) {
optionsCount++;
@ -69,7 +68,7 @@ const mapSelectableInputs = (discover) => {
if (name === SKIP_EXTRA.name) {
const skip = parseInt(value);
if (isFinite(skip)) {
return Math.floor(skip / CATALOG_PAGE_SIZE) + 1;
return Math.floor(skip / CONSTANTS.CATALOG_PAGE_SIZE) + 1;
}
}
@ -111,7 +110,7 @@ const mapSelectableInputs = (discover) => {
const extraSelects = discover.selectable.extra.map((extra) => {
const title = `Select ${extra.name}`;
const isRequired = extra.isRequired;
const options = (extra.isRequired ? [] : [NONE_EXTRA_VALUE])
const options = (extra.isRequired ? [] : [CONSTANTS.NONE_EXTRA_VALUE])
.concat(extra.options)
.map((option) => ({
value: option,
@ -121,13 +120,13 @@ const mapSelectableInputs = (discover) => {
.reduce((selected, [name, value]) => {
if (name === extra.name) {
selected = selected
.filter((value) => value !== NONE_EXTRA_VALUE)
.filter((value) => value !== CONSTANTS.NONE_EXTRA_VALUE)
.concat([value]);
}
return selected;
}, extra.isRequired ? [] : [NONE_EXTRA_VALUE]);
const renderLabelText = selected.includes(NONE_EXTRA_VALUE) ?
}, extra.isRequired ? [] : [CONSTANTS.NONE_EXTRA_VALUE]);
const renderLabelText = selected.includes(CONSTANTS.NONE_EXTRA_VALUE) ?
() => title
:
null;
@ -154,9 +153,9 @@ const mapSelectableInputs = (discover) => {
}
const nextValue = event.value === 'next' ?
String(requestedPage * CATALOG_PAGE_SIZE)
String(requestedPage * CONSTANTS.CATALOG_PAGE_SIZE)
:
String((requestedPage - 2) * CATALOG_PAGE_SIZE);
String((requestedPage - 2) * CONSTANTS.CATALOG_PAGE_SIZE);
navigateWithLoadRequest({
base: selectedCatalogRequest.base,
path: {