diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-08-30 12:41:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 12:41:57 +0300 |
| commit | 48c627ef0b3c8e7c76890ad2587828d693370c7e (patch) | |
| tree | dee08da1854ac42ca5f6e216dd4a5baee6728426 /src | |
| parent | ab2ba685e440eae5e4395d44bba366f3baac0c39 (diff) | |
| parent | c129e121f0d3f7e968eebe8244a4a15b654e49b8 (diff) | |
Fix avatar listing and console error (#585)
Fix avatar listing and console error
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/postMessage.tsx | 5 | ||||
| -rw-r--r-- | src/view/FilesAppIntegration.js | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/services/postMessage.tsx b/src/services/postMessage.tsx index ccdd6933..dc9b16a7 100644 --- a/src/services/postMessage.tsx +++ b/src/services/postMessage.tsx @@ -91,8 +91,11 @@ export default class PostMessageService { } private handlePostMessage(data: any) { + const parsed = PostMessageService.parsePostMessage(data); + if (typeof parsed === 'undefined') { + return + } this.postMessageHandlers.forEach((fn: Function): void => { - const parsed = PostMessageService.parsePostMessage(data); if (parsed.deprecated) { console.debug('PostMessageService.handlePostMessage', 'Ignoring deprecated post message', parsed.msgId) return; diff --git a/src/view/FilesAppIntegration.js b/src/view/FilesAppIntegration.js index 557447e5..e8e1a248 100644 --- a/src/view/FilesAppIntegration.js +++ b/src/view/FilesAppIntegration.js @@ -20,7 +20,6 @@ * */ -let documentsMain = null const isPublic = document.getElementById('isPublic') && document.getElementById('isPublic').value === '1' export default { @@ -40,12 +39,6 @@ export default { }, initAfterReady() { - try { - documentsMain = document.getElementById('richdocumentsframe').contentWindow.documentsMain - } catch (e) { - console.debug('[FilesAppIntegration] failed to access documentsMain') - } - if (typeof this.getFileList() !== 'undefined') { this.getFileModel() } @@ -245,8 +238,9 @@ export default { } entry.append(label) - var isFileOwner = !isPublic && this.getFileModel() && typeof this.getFileModel().get('shareOwner') === 'undefined' - if (documentsMain.canEdit && isFileOwner && !view.IsCurrentView) { + const isFileOwner = !isPublic && this.getFileModel() && typeof this.getFileModel().get('shareOwner') === 'undefined' + const canEdit = this.getFileModel() && !!(this.getFileModel().get('permissions') & OC.PERMISSION_UPDATE) + if (isFileOwner && canEdit && !view.IsCurrentView) { var removeButton = $('<div class="icon-close" title="Remove user"/>') removeButton.click(() => { this.sendPostMessage('Action_RemoveView', { ViewId: view.ViewId }) |