Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ADF-5331] - Alpha ADF/JS-API update has been successfully created. #6639

Merged
merged 6 commits into from Feb 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -137,7 +137,7 @@ jobs:
- stage: Check bundle
script:
- ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version)
- ./scripts/npm-check-bundles.sh -v ${ADF_VERSION}
- ./scripts/travis/build/npm-check-bundles.sh -v ${ADF_VERSION}


- stage: Trigger ADF child build
Expand Down
6 changes: 3 additions & 3 deletions demo-shell/README.md
Expand Up @@ -59,7 +59,7 @@ This script is recommended for development environment and not suited for headle

```sh
npm run build
npm run start:dist
npm run start:prod
```

This command builds project in `production` mode.
Expand All @@ -68,8 +68,8 @@ You should need no additional files outside the `dist` folder.

## Development branch build

If you want to run the demo shell with the latest changes from the development branch, use the following command from the /script folder:
If you want to run the demo shell with the latest changes from the development branch, use the following command :

```sh
npm run start:dev
npm run start
```
15 changes: 8 additions & 7 deletions lib/core/viewer/components/viewer.component.ts
Expand Up @@ -243,14 +243,15 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
};

constructor(private apiService: AlfrescoApiService,
private viewUtils: ViewUtilService,
private viewUtilService: ViewUtilService,
private logService: LogService,
private extensionService: AppExtensionService,
private el: ElementRef) {
viewUtilService.maxRetries = this.maxRetries;
}

isSourceDefined(): boolean {
return (this.urlFile || this.blobFile || this.nodeId || this.sharedLinkId) ? true : false;
return !!(this.urlFile || this.blobFile || this.nodeId || this.sharedLinkId);
}

ngOnInit() {
Expand All @@ -261,12 +262,12 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
);

this.subscriptions.push(
this.viewUtils.viewerTypeChange.subscribe((type: string) => {
this.viewUtilService.viewerTypeChange.subscribe((type: string) => {
this.viewerType = type;
})
);
this.subscriptions.push(
this.viewUtils.urlFileContentChange.subscribe((content: string) => {
this.viewUtilService.urlFileContentChange.subscribe((content: string) => {
this.urlFileContent = content;
})
);
Expand Down Expand Up @@ -410,9 +411,9 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {

if (this.viewerType === 'unknown') {
if (versionData) {
setupNode = this.viewUtils.displayNodeRendition(nodeData.id, versionData.id);
setupNode = this.viewUtilService.displayNodeRendition(nodeData.id, versionData.id);
} else {
setupNode = this.viewUtils.displayNodeRendition(nodeData.id);
setupNode = this.viewUtilService.displayNodeRendition(nodeData.id);
}
}

Expand Down Expand Up @@ -620,7 +621,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
this.print.next(args);

if (!args.defaultPrevented) {
this.viewUtils.printFileGeneric(this.nodeId, this.mimeType);
this.viewUtilService.printFileGeneric(this.nodeId, this.mimeType);
}
}
}
Expand Down