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

feat(popup): Renamed popupText to suiPopup to reduce markup #239

Open
wants to merge 1 commit into
base: v0.10.0
Choose a base branch
from
Open
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
6 changes: 3 additions & 3 deletions demo/src/app/components/api/api.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ <h4 class="ui header">
<div class="content">
<div class="header">
<code>{{ property.name }}</code>&nbsp;
<div class="ui grey medium horizontal label" suiPopup popupText="Data Type">{{ property.type }}</div>
<div class="ui teal medium horizontal label" *ngIf="property.defaultValue" suiPopup popupText="Default Value">{{ property.defaultValue }}</div>
<div class="ui grey medium horizontal label" suiPopup="Data Type">{{ property.type }}</div>
<div class="ui teal medium horizontal label" *ngIf="property.defaultValue" suiPopup="Default Value">{{ property.defaultValue }}</div>
<div class="ui red medium horizontal label" *ngIf="property.required">required</div>
</div>
<div class="description" [innerHTML]="property.description"></div>
Expand All @@ -30,7 +30,7 @@ <h4 class="ui header">
<div class="content">
<div class="header">
<code>{{ event.name }}</code>&nbsp;
<div class="ui grey medium horizontal label" suiPopup popupText="Data Type">{{ event.type }}</div>
<div class="ui grey medium horizontal label" suiPopup="Data Type">{{ event.type }}</div>
</div>
<div class="description" [innerHTML]="event.description"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/components/example/example.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="example">
<div class="info">
<ng-content select="[info]"></ng-content>
<i class="icon code" (click)="detail = !detail" suiPopup popupText="View Source" popupInverted></i>
<i class="icon code" (click)="detail = !detail" suiPopup="View Source" popupInverted></i>
</div>
<div class="html ui top attached segment">
<ng-content select="[result]"></ng-content>
Expand Down
8 changes: 4 additions & 4 deletions demo/src/app/pages/modules/popup/popup.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ApiDefinition } from "../../../components/api/api.component";
import { SuiPopupConfig } from "ng2-semantic-ui";

const exampleStandardTemplate = `
<button class="ui green icon button" suiPopup popupHeader="Example" popupText="This is an example popup">
<button class="ui green icon button" suiPopup="This is an example popup" popupHeader="Example">
<i class="add icon"></i>
</button>
`;
Expand All @@ -21,7 +21,7 @@ const exampleTemplateTemplate = `
`;

const examplePlacementTemplate = `
<div class="ui card" suiPopup popupText="You can customise my placement!" popupInverted [popupPlacement]="position">
<div class="ui card" suiPopup="You can customise my placement!" popupInverted [popupPlacement]="position">
<div class="content">
<div class="header">Positioning</div>
<div class="description">
Expand All @@ -41,7 +41,7 @@ export class PopupPage {
selector: "[suiPopup]",
properties: [
{
name: "popupText",
name: "suiPopup",
type: "string",
description: "Sets the text within the popup."
},
Expand Down Expand Up @@ -130,7 +130,7 @@ export class PopupPage {
public position:string = "bottom right";

public manualPopupMarkup:string = `
<div class="ui segment" suiPopup popupText="Manual" popupTrigger="manual" #popup="suiPopup">
<div class="ui segment" suiPopup="Manual" popupTrigger="manual" #popup="suiPopup">
<button class="ui button" (click)="popup.open()">Open!</button>
<button class="ui button" (click)="openPopup(popup)">Conditionally Open!</button>
<button class="ui button" (click)="popup.toggle()">Toggle!</button>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/popup/directives/popup.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class SuiPopupDirective extends SuiPopupController {
this.popup.config.header = header;
}

@Input()
@Input("suiPopup")
public set popupText(text:string) {
this.popup.config.text = text;
}
Expand Down