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.

Sign up for GitHub

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

Jump to bottom

on anchor clicked contract change #1924

Merged
merged 15 commits into from Sep 19, 2018
Merged

on anchor clicked contract change #1924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1075077
Honour preexpandSingleShowCardAction and weight of fact title from Ho…
dptejas Mar 13, 2018
de488f2
Addressed comments
dptejas Apr 3, 2018
5c1bee2
Merge branch 'master' of https://github.com/Microsoft/AdaptiveCards
dptejas May 25, 2018
172e549
Merge branch 'master' of https://github.com/Microsoft/AdaptiveCards
dptejas May 27, 2018
c709c0c
Merge branch 'master' of https://github.com/Microsoft/AdaptiveCards
dptejas Jun 6, 2018
be258a6
change contract on onAnchorClicked
dptejas Sep 19, 2018
a4d70d5
Merge branch 'master' of https://github.com/Microsoft/AdaptiveCards
dptejas Sep 19, 2018
bc94cf6
Merge branch 'master' into dptejas/onAnchorClickedContractChange
dptejas Sep 19, 2018
e26a312
interface contract change
dptejas Sep 19, 2018
b10e6b2
update one more interface
dptejas Sep 19, 2018
ef7b93b
resolve comments
dptejas Sep 19, 2018
3febc05
resolve comments
dptejas Sep 19, 2018
102410e
resolve comment and make modifications at designer as well
dptejas Sep 19, 2018
57f18f2
container changes in visualizer
dptejas Sep 19, 2018
ece709d
resolve comments
dptejas Sep 19, 2018
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 source/nodejs/adaptivecards-designer/src/containers/host-container.ts
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ export abstract class HostContainer {
// Do nothing in base implementation
}

public anchorClicked(rootCard: Adaptive.AdaptiveCard, anchor: HTMLAnchorElement): boolean {
public anchorClicked(element: Adaptive.CardElement, anchor: HTMLAnchorElement): boolean {
// Not handled by the host container by default
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/adaptivecards-designer/src/containers/outlook-container.ts
View file
Open in desktop
Expand Up @@ -116,9 +116,9 @@ export class OutlookContainer extends HostContainer {
}
}

public anchorClicked(rootCard: Adaptive.AdaptiveCard, anchor: HTMLAnchorElement): boolean {
public anchorClicked(element: Adaptive.CardElement, anchor: HTMLAnchorElement): boolean {
var regEx = /^action:([a-z0-9]+)$/ig;

var rootCard = element.getRootElement() as Adaptive.AdaptiveCard;
var matches = regEx.exec(anchor.href);

if (matches) {
Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/adaptivecards-visualizer/src/app.ts
View file
Open in desktop
Expand Up @@ -384,8 +384,8 @@ function monacoEditorLoaded() {
getSelectedHostContainer().parseElement(element, json);
}

AdaptiveCards.AdaptiveCard.onAnchorClicked = (rootCard: AdaptiveCards.AdaptiveCard, anchor: HTMLAnchorElement) => {
return getSelectedHostContainer().anchorClicked(rootCard, anchor);
AdaptiveCards.AdaptiveCard.onAnchorClicked = (element: AdaptiveCards.CardElement, anchor: HTMLAnchorElement) => {
return getSelectedHostContainer().anchorClicked(element, anchor);
}

currentConfigPayload = Constants.defaultConfigPayload;
Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/adaptivecards-visualizer/src/containers/host-container.ts
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ export abstract class HostContainer {
// Do nothing in base implementation
}

public anchorClicked(rootCard: AdaptiveCard, anchor: HTMLAnchorElement): boolean {
public anchorClicked(element: CardElement, anchor: HTMLAnchorElement): boolean {
// Not handled by the host container by default
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion source/nodejs/adaptivecards-visualizer/src/containers/outlook.ts
View file
Open in desktop
Expand Up @@ -120,8 +120,9 @@ export class OutlookContainer extends HostContainer {
}
}

public anchorClicked(rootCard: Adaptive.AdaptiveCard, anchor: HTMLAnchorElement): boolean {
public anchorClicked(element: Adaptive.CardElement, anchor: HTMLAnchorElement): boolean {
var regEx = /^action:([a-z0-9]+)$/ig;
var rootCard = element.getRootElement() as Adaptive.AdaptiveCard;

var matches = regEx.exec(anchor.href);

Expand Down
6 changes: 3 additions & 3 deletions source/nodejs/adaptivecards/src/card-elements.ts
View file
Open in desktop
Expand Up @@ -5018,7 +5018,7 @@ function raiseAnchorClickedEvent(element: CardElement, anchor: HTMLAnchorElement
let card = element.getRootElement() as AdaptiveCard;
let onAnchorClickedHandler = (card && card.onAnchorClicked) ? card.onAnchorClicked : AdaptiveCard.onAnchorClicked;

return onAnchorClickedHandler != null ? onAnchorClickedHandler(card, anchor) : false;
return onAnchorClickedHandler != null ? onAnchorClickedHandler(element, anchor) : false;
}

function raiseExecuteActionEvent(action: Action) {
Expand Down Expand Up @@ -5325,7 +5325,7 @@ export class AdaptiveCard extends ContainerWithActions {
static readonly elementTypeRegistry = new ElementTypeRegistry();
static readonly actionTypeRegistry = new ActionTypeRegistry();

static onAnchorClicked: (rootCard: AdaptiveCard, anchor: HTMLAnchorElement) => boolean = null;
static onAnchorClicked: (element: CardElement, anchor: HTMLAnchorElement) => boolean = null;
static onExecuteAction: (action: Action) => void = null;
static onElementVisibilityChanged: (element: CardElement) => void = null;
static onImageLoaded: (image: Image) => void = null;
Expand Down Expand Up @@ -5417,7 +5417,7 @@ export class AdaptiveCard extends ContainerWithActions {
return true;
}

onAnchorClicked: (rootCard: AdaptiveCard, anchor: HTMLAnchorElement) => boolean = null;
onAnchorClicked: (element: CardElement, anchor: HTMLAnchorElement) => boolean = null;
onExecuteAction: (action: Action) => void = null;
onElementVisibilityChanged: (element: CardElement) => void = null;
onImageLoaded: (image: Image) => void = null;
Expand Down