inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #617 from Alfresco/dev-eromano-604

Browse Source 
Fix same file content is displayed as first document opened
This commit is contained in:
Denys Vuika 2016-08-25 13:51:53 +01:00 committed by GitHub
commit 132d74f060
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo-shell-ng2/app/components/files/files.component.ts
View File

@ -120,7 +120,7 @@ export class FilesComponent implements OnInit {
return this.acceptedFilesTypeShow; return this.acceptedFilesTypeShow;
} }
toggleVersioning(){ toggleVersioning() {
this.versioning = !this.versioning; this.versioning = !this.versioning;
return this.versioning; return this.versioning;
} }

6
ng2-components/ng2-alfresco-viewer/src/viewer.component.html
View File

@ -48,13 +48,13 @@
<div id="viewer-content-container" class="viewer-content-container mdl-cell" > <div id="viewer-content-container" class="viewer-content-container mdl-cell" >
<!-- Start View Switch--> <!-- Start View Switch-->
<div *ngIf="isPdf()"> <div *ngIf="isPdf()">
<pdf-viewer [showToolbar]="showToolbar" [urlFile]="urlFile" [nameFile]="displayName" ></pdf-viewer> <pdf-viewer [showToolbar]="showToolbar" [urlFile]="urlFileContent" [nameFile]="displayName" ></pdf-viewer>
</div> </div>
<div class="center-element" *ngIf="isImage()" > <div class="center-element" *ngIf="isImage()" >
<img-viewer [urlFile]="urlFile" [nameFile]="displayName"></img-viewer> <img-viewer [urlFile]="urlFileContent" [nameFile]="displayName"></img-viewer>
</div> </div>
<div *ngIf="!supportedExtension()"> <div *ngIf="!supportedExtension()">
<not-supported-format [urlFile]="urlFile" [nameFile]="displayName" ></not-supported-format> <not-supported-format [urlFile]="urlFileContent" [nameFile]="displayName" ></not-supported-format>
</div> </div>
<!-- End View Switch --> <!-- End View Switch -->
</div> </div>

5
ng2-components/ng2-alfresco-viewer/src/viewer.component.ts
View File

@ -51,6 +51,8 @@ export class ViewerComponent {
@Output() @Output()
showViewerChange: EventEmitter<boolean> = new EventEmitter<boolean>(); showViewerChange: EventEmitter<boolean> = new EventEmitter<boolean>();
urlFileContent: string;
otherMenu: any; otherMenu: any;
displayName: string; displayName: string;
@ -76,11 +78,12 @@ export class ViewerComponent {
let filenameFromUrl = this.getFilenameFromUrl(this.urlFile); let filenameFromUrl = this.getFilenameFromUrl(this.urlFile);
this.displayName = filenameFromUrl ? filenameFromUrl : ''; this.displayName = filenameFromUrl ? filenameFromUrl : '';
this.extension = this.getFileExtension(filenameFromUrl); this.extension = this.getFileExtension(filenameFromUrl);
this.urlFileContent = this.urlFile;
} else if (this.fileNodeId) { } else if (this.fileNodeId) {
this.authService.getAlfrescoApi().nodes.getNodeInfo(this.fileNodeId).then((data) => { this.authService.getAlfrescoApi().nodes.getNodeInfo(this.fileNodeId).then((data) => {
this.mimeType = data.content.mimeType; this.mimeType = data.content.mimeType;
this.displayName = data.name; this.displayName = data.name;
this.urlFile = this.authService.getAlfrescoApi().content.getContentUrl(data.id); this.urlFileContent = this.authService.getAlfrescoApi().content.getContentUrl(data.id);
this.loaded = true; this.loaded = true;
}, function (error) { }, function (error) {
console.log('This node does not exist'); console.log('This node does not exist');