From 10a00f8391ecd46ab8df5a21fd636eb9104759c9 Mon Sep 17 00:00:00 2001 From: djmaze Date: Thu, 19 Mar 2020 15:22:07 +0100 Subject: [PATCH] Bugfix: remove JavaScript isFramed() as it requires the removed GoogleSocial --- dev/Model/Attachment.js | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js index b434247f5..9555e7ddb 100644 --- a/dev/Model/Attachment.js +++ b/dev/Model/Attachment.js @@ -3,7 +3,7 @@ import _ from '_'; import ko from 'ko'; import { FileType } from 'Common/Enums'; -import { bAllowPdfPreview, data as GlobalsData } from 'Common/Globals'; +import { bAllowPdfPreview } from 'Common/Globals'; import { trim, pInt, inArray, isNonEmptyArray, getFileExtension, friendlySize } from 'Common/Utils'; import { attachmentDownload, @@ -357,25 +357,11 @@ class AttachmentModel extends AbstractModel { return FileType.Pdf === this.fileType; } - /** - * @returns {boolean} - */ - isFramed() { - return ( - this.framed && - GlobalsData.__APP__ && - GlobalsData.__APP__.googlePreviewSupported() && - !(this.isPdf() && bAllowPdfPreview) && - !this.isText() && - !this.isImage() - ); - } - /** * @returns {boolean} */ hasPreview() { - return this.isImage() || (this.isPdf() && bAllowPdfPreview) || this.isText() || this.isFramed(); + return this.isImage() || (this.isPdf() && bAllowPdfPreview) || this.isText(); } /** @@ -445,9 +431,6 @@ class AttachmentModel extends AbstractModel { case this.isText(): result = this.linkPreviewAsPlain(); break; - case this.isFramed(): - result = this.linkFramed(); - break; // no default }