Merge pull request #1122 from nextcloud/backport/1108/stable29

[stable29] Fix disabled annotation edition in view only files

Author: danxuliu

js/files_pdfviewer-main.js

@@ -115,7 +115,6 @@ export default {
 			if (this.isEditable) {
 				this.$nextTick(() => {
 					this.getDownloadElement().removeAttribute('hidden')
-					this.getEditorModeButtonsElement().removeAttribute('hidden')
 				})
 			}
 		},
@@ -130,10 +129,6 @@ export default {
 			return this.getIframeDocument().getElementById('download')
 		},
 
-		getEditorModeButtonsElement() {
-			return this.getIframeDocument().getElementById('editorModeButtons')
-		},
-
 		handleWebviewerloaded() {
 			const PDFViewerApplicationOptions = this.$refs.iframe.contentWindow.PDFViewerApplicationOptions
 
@@ -162,6 +157,10 @@ export default {
 				// AnnotationMode.ENABLE value is 1 in PDF.js, which shows
 				// forms, but does not allow to interact with them
 				PDFViewerApplicationOptions.set('annotationMode', 1)
+
+				// AnnotationEditorType.DISABLE value is -1 in PDF.js, which
+				// prevents editing annotations
+				PDFViewerApplicationOptions.set('annotationEditorMode', -1)
 			}
 
 			// PDFViewerApplication can not be set when the "webviewerloaded"

js/files_pdfviewer-main.js.map

@@ -303,7 +303,7 @@
 
                 <div class="verticalToolbarSeparator hiddenMediumView"></div>
 
-                <div id="editorModeButtons" class="splitToolbarButton toggled" role="radiogroup" hidden="true">
+                <div id="editorModeButtons" class="splitToolbarButton toggled" role="radiogroup">
                   <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Text" role="radio" aria-checked="false" aria-controls="editorFreeTextParamsToolbar" tabindex="34" data-l10n-id="editor_free_text2">
                     <span data-l10n-id="editor_free_text2_label">Text</span>
                   </button>
@@ -315,7 +315,7 @@
                   </button>
                 </div>
 
-                <div id="editorModeSeparator" class="verticalToolbarSeparator" hidden="true"></div>
+                <div id="editorModeSeparator" class="verticalToolbarSeparator"></div>
 
                 <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="48" data-l10n-id="tools" aria-expanded="false" aria-controls="secondaryToolbar">
                   <span data-l10n-id="tools_label">Tools</span>