Skip to content

Allow registering aliases without components #49

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

Merged
skjnldsv merged 2 commits into from
Mar 23, 2019
Merged

Allow registering aliases without components #49

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35da0da
Allow registering aliases without components
skjnldsv Mar 21, 2019
e46a354
Fix mime groups and mimes list parsing
skjnldsv Mar 21, 2019
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
Prev Previous commit
Fix mime groups and mimes list parsing 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Mar 21, 2019
commit e46a354822ba71a640aeaaaf6246af18064ac8a4
44 changes: 28 additions & 16 deletions src/views/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ export default {

const group = this.mimeGroups[mime]
const mimes = this.mimeGroups[group]
? this.mimeGroups[group]
: [mime]

// retrieve, sort and store file List
const fileList = await FileList(OC.getCurrentUser().uid, fileInfo.dir, mimes)
Expand Down Expand Up @@ -331,19 +333,25 @@ export default {

// checking valid handler id
if (!handler.id || handler.id.trim() === '' || typeof handler.id !== 'string') {
console.error(`The following handler doesn't have proper id`, handler)
console.error(`The following handler doesn't have a valid id`, handler)
return
}

// checking valid handler mime data
if (!handler.mimes || !Array.isArray(handler.mimes)) {
console.error(`The following handler doesn't have proper mime data`, handler)
// checking if no valid mimes data and no mimes Aliases
if (!(handler.mimes && Array.isArray(handler.mimes)) && !handler.mimesAliases) {
console.error(`The following handler doesn't have a valid mime array`, handler)
return
}

if (handler.mimesAliases && typeof handler.mimesAliases !== 'object') {
console.error(`The following handler doesn't have a valid mimesAliases object`, handler)
return

}

// checking valid handler component data AND no alias (we can register alias without component)
if ((!handler.component || typeof handler.component !== 'object') && !handler.mimesAliases) {
console.error(`The following handler doesn't have proper component`, handler)
console.error(`The following handler doesn't have a valid component`, handler)
return
}

Expand Down Expand Up @@ -372,20 +380,24 @@ export default {
this.registeredHandlers.push(handler.id)
}

handler.mimes.forEach(mime => {
// checking valid mime
if (this.components[mime]) {
console.error(`The following mime is already registered`, mime, handler)
return
}
// parsing mimes registration
if (handler.mimes) {
handler.mimes.forEach(mime => {
// checking valid mime
if (this.components[mime]) {
console.error(`The following mime is already registered`, mime, handler)
return
}

register({ mime, handler })
register({ mime, handler })

// register mime's component
this.components[mime] = handler.component
Vue.component(handler.component.name, handler.component)
})
// register mime's component
this.components[mime] = handler.component
Vue.component(handler.component.name, handler.component)
})
}

// parsing aliases registration
if (handler.mimesAliases) {
Object.keys(handler.mimesAliases).forEach(mime => {
// checking valid mime
Expand Down