Skip to content

If mediaPlayer is included in current loaded iconSet, doesn't tries to load part of iconSet from this library #366

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

Open
MekDrop wants to merge 1 commit into
base: next
Choose a base branch
from
Open

If mediaPlayer is included in current loaded iconSet, doesn't tries to load part of iconSet from this library #366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions ui/src/components/QMediaPlayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,14 +857,19 @@ export default defineComponent({
}

async function __setupIcons () {
const iconSetName = $q.iconSet.name || 'material-icons'
let icnSet
try {
icnSet = await __loadIconSet(iconSetName)
}
catch (e) {
let icnSet;

if (typeof $q.iconSet.mediaPlayer === 'object') {
icnSet = $q.iconSet;
} else {
const iconSetName = $q.iconSet.name || 'material-icons';

try {
icnSet = await __loadIconSet(iconSetName);
} catch (e) {
}
}
icnSet !== void 0 && icnSet.name !== void 0 && (iconSet.mediaPlayer = { ...icnSet.mediaPlayer })
icnSet !== void 0 && icnSet.name !== void 0 && (iconSet.mediaPlayer = { ...icnSet.mediaPlayer });
}

async function __loadIconSet (set) {
Expand Down