Skip to content

Commit

Permalink
Merge pull request #1965 from nextcloud/fix/icon
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Sep 5, 2023
2 parents 294fefc + ab3de5a commit c0388d0
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions js/viewer-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
},
"dependencies": {
"@fontsource/roboto": "^5.0.8",
"@mdi/svg": "^7.2.96",
"@nextcloud/auth": "^2.1.0",
"@nextcloud/axios": "^2.1.0",
"@nextcloud/dialogs": "^4.2.0-beta.4",
Expand Down
3 changes: 2 additions & 1 deletion src/views/Viewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ import logger from '../services/logger.js'

import Delete from 'vue-material-design-icons/Delete.vue'
import Download from 'vue-material-design-icons/Download.vue'
import EyeSvg from '@mdi/svg/svg/eye.svg?raw'
import Fullscreen from 'vue-material-design-icons/Fullscreen.vue'
import FullscreenExit from 'vue-material-design-icons/FullscreenExit.vue'
import Pencil from 'vue-material-design-icons/Pencil.vue'
Expand Down Expand Up @@ -920,7 +921,7 @@ export default {
displayName() {
return t('viewer', 'View')
},
iconSvgInline: () => '',
iconSvgInline: () => EyeSvg,
default: DefaultType.DEFAULT,
enabled: (nodes) => {
return nodes.filter((node) => node.permissions & Permission.READ
Expand Down
5 changes: 5 additions & 0 deletions webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ webpackRules.RULE_JS.exclude = BabelLoaderExcludeNodeModulesExcept([
'toastify-js',
])

webpackRules.RULE_SVG = {
resourceQuery: /raw/,
type: 'asset/source',
}

// Replaces rules array
webpackConfig.module.rules = Object.values(webpackRules)

Expand Down

0 comments on commit c0388d0

Please sign in to comment.