Skip to content

Commit a625016

Browse files
vladimir-litvinchikvladimir-litvinchik
authored
Merge 8.0.6 branch into main (#70)
* Update GroupDocs logo image source in samples * Fix for jump to the next page when scrolling * Update path in the default message * Translate "Fit Width" and "Fit Height" strings in Zoom selector * Use page image for thumbnail in image mode * Update GroupDocs.Viewer for .NET to 25.4 * Update `AWSSDK.S3` to latest version `4.0.0.1` * Add missing `GroupDocs.Viewer.UI.Cloud.Api` service registration * Add README files to the correspoding projects * Set packages version to `8.0.6`
1 parent e0c19ef commit a625016

File tree

26 files changed

+1191
-33
lines changed

26 files changed

+1191
-33
lines changed

‎build/dependencies.props‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<PropertyGroup Label="Package Versions">
19-
<GroupDocsViewer>25.3.0</GroupDocsViewer>
19+
<GroupDocsViewer>25.4.0</GroupDocsViewer>
2020

2121
<MicrosoftExtensionsHttp>8.0.1</MicrosoftExtensionsHttp>
2222
<MicrosoftExtensionsDependencyInjectionAbstractions>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractions>
@@ -29,24 +29,24 @@
2929
<SystemTextJson>8.0.5</SystemTextJson>
3030

3131
<AzureBlobs>12.24.0</AzureBlobs>
32-
<AwsSdkS3>3.7.416.3</AwsSdkS3>
32+
<AwsSdkS3>4.0.0.1</AwsSdkS3>
3333

3434
<MicrosoftSourceLinkGithub>8.0.0</MicrosoftSourceLinkGithub>
3535
</PropertyGroup>
3636

3737
<PropertyGroup Label="GroupDocs.Viewer UI Package Versions">
38-
<GroupDocsViewerUI>8.0.5</GroupDocsViewerUI>
39-
<GroupDocsViewerUIApi>8.0.5</GroupDocsViewerUIApi>
40-
<GroupDocsViewerUIApiLocalCache>8.0.5</GroupDocsViewerUIApiLocalCache>
41-
<GroupDocsViewerUIApiInMemoryCache>8.0.5</GroupDocsViewerUIApiInMemoryCache>
42-
<GroupDocsViewerUIApiLocalStorage>8.0.5</GroupDocsViewerUIApiLocalStorage>
43-
<GroupDocsViewerUIApiCloudStorage>8.0.5</GroupDocsViewerUIApiCloudStorage>
44-
<GroupDocsViewerUIApiAzureStorage>8.0.5</GroupDocsViewerUIApiAzureStorage>
45-
<GroupDocsViewerUIApiAwsS3Storage>8.0.5</GroupDocsViewerUIApiAwsS3Storage>
46-
<GroupDocsViewerUICore>8.0.5</GroupDocsViewerUICore>
47-
<GroupDocsViewerUISelfHostApi>8.0.5</GroupDocsViewerUISelfHostApi>
48-
<GroupDocsViewerUISelfHostApiCrossPlatform>8.0.5</GroupDocsViewerUISelfHostApiCrossPlatform>
49-
<GroupDocsViewerUICloudApi>8.0.5</GroupDocsViewerUICloudApi>
38+
<GroupDocsViewerUI>8.0.6</GroupDocsViewerUI>
39+
<GroupDocsViewerUIApi>8.0.6</GroupDocsViewerUIApi>
40+
<GroupDocsViewerUIApiLocalCache>8.0.6</GroupDocsViewerUIApiLocalCache>
41+
<GroupDocsViewerUIApiInMemoryCache>8.0.6</GroupDocsViewerUIApiInMemoryCache>
42+
<GroupDocsViewerUIApiLocalStorage>8.0.6</GroupDocsViewerUIApiLocalStorage>
43+
<GroupDocsViewerUIApiCloudStorage>8.0.6</GroupDocsViewerUIApiCloudStorage>
44+
<GroupDocsViewerUIApiAzureStorage>8.0.6</GroupDocsViewerUIApiAzureStorage>
45+
<GroupDocsViewerUIApiAwsS3Storage>8.0.6</GroupDocsViewerUIApiAwsS3Storage>
46+
<GroupDocsViewerUICore>8.0.6</GroupDocsViewerUICore>
47+
<GroupDocsViewerUISelfHostApi>8.0.6</GroupDocsViewerUISelfHostApi>
48+
<GroupDocsViewerUISelfHostApiCrossPlatform>8.0.6</GroupDocsViewerUISelfHostApiCrossPlatform>
49+
<GroupDocsViewerUICloudApi>8.0.6</GroupDocsViewerUICloudApi>
5050
</PropertyGroup>
5151

5252
<PropertyGroup Label="NuGet Common Settings">

‎samples/GroupDocs.Viewer.UI.Cloud.Api.Sample/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<header>
117117
<div class="header-content">
118118
<a href="https://products.groupdocs.com/">
119-
<img src="https://products.groupdocs.app/viewer/img-redesign/groupdocs.svg" alt="GroupDocs Logo" class="logo">
119+
<img src="https://groupdocs-viewer.github.io/resources/image/groupdocs-logo.svg" alt="GroupDocs Logo" class="logo">
120120
</a>
121121
<a href="https://dashboard.groupdocs.cloud" target="_blank" class="trial-button">Start Free Trial</a>
122122
</div>

‎samples/GroupDocs.Viewer.UI.Sample.CrossPlatform/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<header>
117117
<div class="header-content">
118118
<a href="https://products.groupdocs.com/">
119-
<img src="https://products.groupdocs.app/viewer/img-redesign/groupdocs.svg" alt="GroupDocs Logo" class="logo">
119+
<img src="https://groupdocs-viewer.github.io/resources/image/groupdocs-logo.svg" alt="GroupDocs Logo" class="logo">
120120
</a>
121121
<a href="https://purchase.groupdocs.com/buy/cart?ppId=99940" target="_blank" class="trial-button">Start Free Trial</a>
122122
</div>

‎samples/GroupDocs.Viewer.UI.Sample.CustomCacheProvider/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<header>
117117
<div class="header-content">
118118
<a href="https://products.groupdocs.com/">
119-
<img src="https://products.groupdocs.app/viewer/img-redesign/groupdocs.svg" alt="GroupDocs Logo" class="logo">
119+
<img src="https://groupdocs-viewer.github.io/resources/image/groupdocs-logo.svg" alt="GroupDocs Logo" class="logo">
120120
</a>
121121
<a href="https://purchase.groupdocs.com/buy/cart?ppId=99940" target="_blank" class="trial-button">Start Free Trial</a>
122122
</div>

‎samples/GroupDocs.Viewer.UI.Sample.StaticContentMode.Generator/Program.cs‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@ internal class Program
2121
private const string API_ENDPOINT = "/";
2222
private const string CONTENT_FOLDER = "Content";
2323

24+
//NOTE: Thumbnails are only used when rendering to HTML
25+
private static bool CreateThumbnails => VIEWER_TYPE == ViewerType.HtmlWithEmbeddedResources
26+
|| VIEWER_TYPE == ViewerType.HtmlWithExternalResources;
27+
2428
static async Task Main(string[] args)
2529
{
2630
Config apiConfig = new Config();
2731
apiConfig.SetViewerType(VIEWER_TYPE);
28-
//apiConfig.SetLicensePath("GroupDocs.Viewer.lic");
32+
//apiConfig.SetLicensePath("c://Licenses//GroupDocs.Viewer.lic");
2933

3034
IFileStorage fileStorage = new LocalFileStorage(STORAGE_PATH);
3135
IApiUrlBuilder urlBuilder = new StaticUrlBuilder(API_ENDPOINT);
@@ -43,8 +47,14 @@ static async Task Main(string[] args)
4347
FileCredentials fileCredentials = new FileCredentials(file.FilePath, extension, password);
4448

4549
int[] pageNumbers = await CreateViewData(viewer, fileCredentials, urlBuilder);
50+
4651
await CreatePagesAsync(viewer, fileCredentials, pageNumbers);
47-
await CreateThumbsAsync(viewer, fileCredentials, pageNumbers);
52+
53+
if(CreateThumbnails)
54+
{
55+
await CreateThumbsAsync(viewer, fileCredentials, pageNumbers);
56+
}
57+
4858
await CreatePdfAsync(viewer, fileCredentials);
4959

5060
Console.WriteLine(" Done.");
@@ -157,7 +167,11 @@ private static async Task<int[]> CreateViewData(IViewer viewer, FileCredentials
157167
foreach (PageInfo page in documentInfo.Pages)
158168
{
159169
var pageUrl = urlBuilder.BuildPageUrl(fileCredentials.FilePath, page.Number, viewer.PageExtension);
160-
var thumbUrl = urlBuilder.BuildThumbUrl(fileCredentials.FilePath, page.Number, viewer.ThumbExtension);
170+
171+
var thumbUrl = CreateThumbnails
172+
? urlBuilder.BuildThumbUrl(fileCredentials.FilePath, page.Number, viewer.ThumbExtension)
173+
: null;
174+
161175
var pageData = new PageData(page.Number, page.Width, page.Height, pageUrl, thumbUrl);
162176

163177
pages.Add(pageData);

‎samples/GroupDocs.Viewer.UI.Sample.StaticContentMode/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<header>
117117
<div class="header-content">
118118
<a href="https://products.groupdocs.com/">
119-
<img src="https://products.groupdocs.app/viewer/img-redesign/groupdocs.svg" alt="GroupDocs Logo" class="logo">
119+
<img src="https://groupdocs-viewer.github.io/resources/image/groupdocs-logo.svg" alt="GroupDocs Logo" class="logo">
120120
</a>
121121
<a href="https://purchase.groupdocs.com/buy/cart?ppId=99940" target="_blank" class="trial-button">Start Free Trial</a>
122122
</div>

‎samples/GroupDocs.Viewer.UI.Sample.ViewAsPng/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<header>
117117
<div class="header-content">
118118
<a href="https://products.groupdocs.com/">
119-
<img src="https://products.groupdocs.app/viewer/img-redesign/groupdocs.svg" alt="GroupDocs Logo" class="logo">
119+
<img src="https://groupdocs-viewer.github.io/resources/image/groupdocs-logo.svg" alt="GroupDocs Logo" class="logo">
120120
</a>
121121
<a href="https://purchase.groupdocs.com/buy/cart?ppId=99940" target="_blank" class="trial-button">Start Free Trial</a>
122122
</div>

‎samples/GroupDocs.Viewer.UI.Sample/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<header>
117117
<div class="header-content">
118118
<a href="https://products.groupdocs.com/">
119-
<img src="https://products.groupdocs.app/viewer/img-redesign/groupdocs.svg" alt="GroupDocs Logo" class="logo">
119+
<img src="https://groupdocs-viewer.github.io/resources/image/groupdocs-logo.svg" alt="GroupDocs Logo" class="logo">
120120
</a>
121121
<a href="https://purchase.groupdocs.com/buy/cart?ppId=99940" target="_blank" class="trial-button">Start Free Trial</a>
122122
</div>

‎samples/GroupDocs.Viewer.UI.SelfHost.Api.App.Sample/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<header>
117117
<div class="header-content">
118118
<a href="https://products.groupdocs.com/">
119-
<img src="https://products.groupdocs.app/viewer/img-redesign/groupdocs.svg" alt="GroupDocs Logo" class="logo">
119+
<img src="https://groupdocs-viewer.github.io/resources/image/groupdocs-logo.svg" alt="GroupDocs Logo" class="logo">
120120
</a>
121121
<a href="https://purchase.groupdocs.com/buy/cart?ppId=99940" target="_blank" class="trial-button">Start Free Trial</a>
122122
</div>

‎samples/GroupDocs.Viewer.UI.SelfHost.Api.Service.Sample/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
{
4949
endpoints.MapGet("/", async context =>
5050
{
51-
await context.Response.WriteAsync("Viewer API can be accessed at '/viewer-api' endpoint.");
51+
await context.Response.WriteAsync("Viewer API can be accessed at '/document-viewer-api' endpoint.");
5252
});
5353

5454
endpoints.MapGroupDocsViewerApi(options =>

0 commit comments

Comments
 (0)