From 552cbbb273f9c8759efcecba52aedb01ef9d31ed Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Fri, 24 Mar 2017 13:27:51 +0000
Subject: [PATCH] bug fixes for thumbnails and Safari download (#1763)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- set ‘show thumbnail’ to true by default
- add support for safe downloads in Safari (upcoming 10.1 and TP)
---
 .../src/components/activiti-content.component.ts       |  2 +-
 .../widgets/display-value/display-value.widget.ts      |  6 ++++--
 .../ng2-alfresco-core/src/services/content.service.ts  | 10 +++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts
index 531f9fdc9b..5b5f55517d 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-content.component.ts
@@ -33,7 +33,7 @@ export class ActivitiContent implements OnChanges {
     id: string;
 
     @Input()
-    showDocumentContent: boolean = false;
+    showDocumentContent: boolean = true;
 
     @Output()
     contentClick = new EventEmitter();
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts
index 3828614e65..6f2537ce49 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts
@@ -48,7 +48,7 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit {
 
     // upload/attach
     hasFile: boolean = false;
-    showDocumentContent: boolean = false;
+    showDocumentContent: boolean = true;
 
     constructor(private formService: FormService,
                 private visibilityService: WidgetVisibilityService,
@@ -61,7 +61,9 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit {
             this.value = this.field.value;
             this.visibilityService.refreshEntityVisibility(this.field);
             if (this.field.params) {
-                this.showDocumentContent = !!this.field.params['showDocumentContent'];
+                if (this.field.params['showDocumentContent'] !== undefined) {
+                    this.showDocumentContent = !!this.field.params['showDocumentContent'];
+                }
                 let originalField = this.field.params['field'];
                 if (originalField && originalField.type) {
                     this.fieldType = originalField.type;
diff --git a/ng2-components/ng2-alfresco-core/src/services/content.service.ts b/ng2-components/ng2-alfresco-core/src/services/content.service.ts
index cad5a87725..a9da8a6637 100644
--- a/ng2-components/ng2-alfresco-core/src/services/content.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/content.service.ts
@@ -32,17 +32,13 @@ export class ContentService {
             return function (data, format, fileName) {
                 let blob = null;
 
-                if (format === 'blob') {
-                    blob = data;
-                }
-
-                if (format === 'data') {
-                    blob = new Blob([data], {type: 'octet/stream'});
+                if (format === 'blob' || format === 'data') {
+                    blob = new Blob([data], { type: 'octet/stream' });
                 }
 
                 if (format === 'object' || format === 'json') {
                     let json = JSON.stringify(data);
-                    blob = new Blob([json], {type: 'octet/stream'});
+                    blob = new Blob([json], { type: 'octet/stream' });
                 }
 
                 if (blob) {