Skip to content

Commit

Permalink
Merge pull request #3807 from nextcloud/private/darshan/add-title-att…
Browse files Browse the repository at this point in the history
…r-in-iframe

Add 'title' attribute to iframe for accessibility
  • Loading branch information
juliushaertl committed Jul 15, 2024
2 parents 51077f2 + f209915 commit be6ad4b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Config from './services/config.tsx'
import { getUIDefaults, generateCSSVarTokens, getCollaboraTheme } from './helpers/coolParameters.js'
import { enableScrollLock } from './helpers/safariFixer.js'
import PostMessageService from './services/postMessage.tsx'
import { getCapabilities } from './services/capabilities.ts'
import {
callMobileMessage,
isDirectEditing,
Expand Down Expand Up @@ -171,7 +172,7 @@ const documentsMain = {
+ '</form>'

// iframe that contains the Collabora Online Viewer
const frame = '<iframe data-cy="coolframe" id="loleafletframe" name="loleafletframe_viewer" allowfullscreen allow="clipboard-read *; clipboard-write *" nonce="' + btoa(getRequestToken()) + '" style="width:100%;height:100%;position:absolute;"/>'
const frame = '<iframe data-cy="coolframe" id="loleafletframe" name="loleafletframe_viewer" allowfullscreen allow="clipboard-read *; clipboard-write *" nonce="' + btoa(getRequestToken()) + '" style="width:100%;height:100%;position:absolute;" title="' + getCapabilities().productName + '"/>'

$('#revViewer').append(form)
$('#revViewer').append(frame)
Expand Down Expand Up @@ -231,7 +232,7 @@ const documentsMain = {
+ '</form>'

// iframe that contains the Collabora Online
const frame = '<iframe data-cy="coolframe" id="loleafletframe" name="loleafletframe" nonce="' + btoa(getRequestToken()) + '" scrolling="no" allowfullscreen allow="clipboard-read *; clipboard-write *" style="width:100%;height:100%;position:absolute;" />'
const frame = '<iframe data-cy="coolframe" id="loleafletframe" name="loleafletframe" nonce="' + btoa(getRequestToken()) + '" scrolling="no" allowfullscreen allow="clipboard-read *; clipboard-write *" style="width:100%;height:100%;position:absolute;" title="' + getCapabilities().productName + '"/>'

$('#mainContainer').append(form)
$('#mainContainer').append(frame)
Expand Down
6 changes: 5 additions & 1 deletion src/view/Office.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
allow="clipboard-read *; clipboard-write *"
class="office-viewer__iframe"
:style="{visibility: showIframe ? 'visible' : 'hidden' }"
:src="iframeSrc" />
:src="iframeSrc"
:title="iframeTitle" />

<NcButton v-if="isEmbedded && !hasWidgetEditingEnabled" class="toggle-interactive" @click="toggleEdit">
{{ t('richdocuments', 'Edit') }}
Expand Down Expand Up @@ -194,6 +195,9 @@ export default {
showIframe() {
return this.loading >= LOADING_STATE.FRAME_READY || this.debug
},
iframeTitle() {
return loadState('richdocuments', 'productName', 'Nextcloud Office')
},
showLoadingIndicator() {
return this.loading < LOADING_STATE.FRAME_READY
},
Expand Down

0 comments on commit be6ad4b

Please sign in to comment.