Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
dynabic-billing-team committed Apr 12, 2024
2 parents fc84233 + 979e98e commit a135824
Show file tree
Hide file tree
Showing 10 changed files with 392 additions and 4 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ Feel free to explore the [Developer's Guide](https://docs.aspose.cloud/display/w
- Add & remove watermarks and protection.
- Read & write access to Document Object Model.

## Enhancements in Version 24.4

- Added the 'MergeWithNext' method to merge a section with the next one.


## Enhancements in Version 24.3

- Added support for 'RemoveEmptyCells' option for the 'Cleanup' parameter in the insert 'MailMerge' API method.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "asposewordscloud",
"version": "24.3.0",
"version": "24.4.0",
"description": "Aspose.Words Cloud SDK for Node.js",
"homepage": "https://products.aspose.cloud/words/cloud",
"author": {
Expand Down
33 changes: 33 additions & 0 deletions src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4597,6 +4597,39 @@ export class WordsApi implements Encryptor {
return Promise.resolve(result);
}

/**
* Merge the section with the next one.
* @param requestObj contains request parameters
*/
public async mergeWithNext(requestObj: model.MergeWithNextRequest): Promise< http.IncomingMessage > {
if (requestObj === null || requestObj === undefined) {
throw new Error('Required parameter "request" was null or undefined when calling mergeWithNext.');
}

const requestOptions = await requestObj.createRequestOptions(this.configuration, this);

const response = await invokeApiMethod(requestOptions, this.configuration);
return Promise.resolve(response);
}

/**
* Merge the section with the next one.
* @param requestObj contains request parameters
*/
public async mergeWithNextOnline(requestObj: model.MergeWithNextOnlineRequest): Promise< model.WordsIncomingMessage< Map<string, Buffer> > > {
if (requestObj === null || requestObj === undefined) {
throw new Error('Required parameter "request" was null or undefined when calling mergeWithNextOnline.');
}

const requestOptions = await requestObj.createRequestOptions(this.configuration, this);

const response = await invokeApiMethod(requestOptions, this.configuration);
const result = new model.WordsIncomingMessage< Map<string, Buffer> >();
result.response = response;
result.body = requestObj.createResponse(response.body, response.headers);
return Promise.resolve(result);
}

/**
* Move file.
* @param requestObj contains request parameters
Expand Down
2 changes: 1 addition & 1 deletion src/internal/requestHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ async function invokeApiMethodInternal(requestOptions: request.OptionsWithUri, c
requestOptions.timeout = 1000 * confguration.timeout;

requestOptions.headers["x-aspose-client"] = "nodejs sdk";
requestOptions.headers["x-aspose-client-version"] = "24.3";
requestOptions.headers["x-aspose-client-version"] = "24.4";
requestOptions.encoding = null;

requestOptions.uri = encodeURI(requestOptions.uri.toString());
Expand Down
11 changes: 11 additions & 0 deletions src/model/drawingObjectInsert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ export class DrawingObjectInsert implements ModelInterface {
name: "wrapType",
baseName: "WrapType",
type: "DrawingObjectInsert.WrapTypeEnum",
},
{
name: "aspectRatioLocked",
baseName: "AspectRatioLocked",
type: "boolean",
}
];

Expand Down Expand Up @@ -130,6 +135,11 @@ export class DrawingObjectInsert implements ModelInterface {
*/
public wrapType: DrawingObjectInsert.WrapTypeEnum;

/**
* Gets or sets a value indicating whether AspectRatioLocked option on or off.
*/
public aspectRatioLocked: boolean;

public constructor(init?: Partial< DrawingObjectInsert >) {
Object.assign(this, init);
}
Expand Down Expand Up @@ -176,6 +186,7 @@ export class DrawingObjectInsert implements ModelInterface {




}
}

Expand Down
10 changes: 10 additions & 0 deletions src/model/drawingObjectUpdate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ export class DrawingObjectUpdate implements ModelInterface {
name: "wrapType",
baseName: "WrapType",
type: "DrawingObjectUpdate.WrapTypeEnum",
},
{
name: "aspectRatioLocked",
baseName: "AspectRatioLocked",
type: "boolean",
}
];

Expand Down Expand Up @@ -118,6 +123,11 @@ export class DrawingObjectUpdate implements ModelInterface {
*/
public wrapType: DrawingObjectUpdate.WrapTypeEnum;

/**
* Gets or sets a value indicating whether AspectRatioLocked option on or off.
*/
public aspectRatioLocked: boolean;

public constructor(init?: Partial< DrawingObjectUpdate >) {
Object.assign(this, init);
}
Expand Down
Loading

0 comments on commit a135824

Please sign in to comment.