From c6ff200835710ed6503d80949d836a19f51ead21 Mon Sep 17 00:00:00 2001 From: Corina Date: Fri, 15 Mar 2019 09:18:24 -0700 Subject: [PATCH 1/2] add watermark and streamUrl parameters to DLJS constructor --- packages/bundle/src/createDirectLine.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/bundle/src/createDirectLine.js b/packages/bundle/src/createDirectLine.js index 5e22f3fb1d..31177de59f 100644 --- a/packages/bundle/src/createDirectLine.js +++ b/packages/bundle/src/createDirectLine.js @@ -1,13 +1,15 @@ import { DirectLine } from 'botframework-directlinejs'; -export default function ({conversationId, domain, fetch, pollingInterval, secret, token, webSocket}) { +export default function ({conversationId, domain, fetch, pollingInterval, secret, streamUrl, token, watermark, webSocket}) { return new DirectLine({ conversationId, domain, fetch, pollingInterval, secret, + streamUrl, token, + watermark, webSocket, botAgent: 'webchat', createFormData: attachments => { From 093fdf38fb3ece7337e6c1f6fa15d779f613c1a3 Mon Sep 17 00:00:00 2001 From: Corina Date: Fri, 15 Mar 2019 09:21:54 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cb774fc9f..b43c8009f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - `*`: Added `username` back to activity, fixed [#1321](https://github.com/Microsoft/BotFramework-WebChat/issues/1321), by [@compulim](https://github.com/compulim), in PR [#1682](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/1682) - `component`: Allow root component height and width customization via `styleOptions.rootHeight` and `styleOptions.rootWidth`, by [@tonyanziano](https://github.com/tonyanziano), in PR [#1702](https://github.com/Microsoft/BotFramework-WebChat/pull/1702) - `component`: Added `cardActionMiddleware` to customize the behavior of card action, by [@compulim](https://github.com/compulim), in PR [#1704](https://github.com/Microsoft/BotFramework-WebChat/pull/1704) +- `bundle`: Add `watermark` and `streamUrl` parameters to createDirectLine, by [@corinagum](https://github.com/corinagum), in PR [#1817](https://github.com/Microsoft/BotFramework-WebChat/pull/1817) ### Changed