Skip to content

Commit 31175e5

Browse files
cal-smithGitHub Enterprise
authored andcommitted
Merge pull request #7 from callums/master
Update readme, change directive prefixes
2 parents 8e4e339 + ed5372c commit 31175e5

11 files changed

+15
-14
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ Your project should use a module bundler - we recommend [webpack](https://webpac
2222
- fork ibm/carbon-components-angular and clone it locally
2323
- run `npm install` to grab all the dependencies, then `npm run demo:server` to start the demo server
2424
- **if you are adding a component**:
25-
- add a folder with your component code, styles, tests, and documentation README.md under `src`
25+
- add a folder with your component code, styles, tests and story under `src`
2626
- export your module from `index.ts`
27-
- add a demo to `./demo/demo_app` (see README.md in that directory for more info)
2827
- **if you are contributing a fix**:
2928
- add your fix, update the documentation as needed
3029
- consider adding or modifying a test case to cover the fix

scripts/prepush.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set -e
44

55
[email protected]:ibm/carbon-components-angular.git
66

7+
npm run lint
8+
79
# Refresh code
810
# git pull upstream master
911

src/dialog/dialog-placeholder.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { DialogPlaceholderService } from "./dialog-placeholder.service";
2121
* A more complete example for `Popover` is given as follows:
2222
*
2323
* ```html
24-
* <button [nPopover]="Hello" appendToBody="true"></button>
24+
* <button [ibmPopover]="Hello" appendToBody="true"></button>
2525
* ...
2626
* <ibm-dialog-placeholder></ibm-dialog-placeholder>
2727
* ```

src/dialog/popover/popover-menu.directive.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { DialogService } from "./../dialog.service";
3232
* </div>
3333
* </ng-template>
3434
* <button class="popover-menu-button"
35-
* [nPopover]="list"
35+
* [ibmPopover]="list"
3636
* placement="bottom-right"
3737
* wrapperClass="popover-content-fullwidth"
3838
* popoverMenu="true"
@@ -58,7 +58,7 @@ import { DialogService } from "./../dialog.service";
5858
* </div>
5959
* </ng-template>
6060
* <button class="btn"
61-
* [nPopover]="filter"
61+
* [ibmPopover]="filter"
6262
* placement="right"
6363
* wrapperClass="popover-content-filter"
6464
* popoverFilter="true">
@@ -72,7 +72,7 @@ import { DialogService } from "./../dialog.service";
7272
* @extends {DialogDirective}
7373
*/
7474
@Directive({
75-
selector: "[nPopoverMenu]",
75+
selector: "[ibmPopoverMenu]",
7676
exportAs: "nPopoverMenu",
7777
providers: [
7878
DialogService

src/dialog/popover/popover.directive.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ describe("Popover directive", () => {
177177
set: {
178178
template: `
179179
<ng-template #customPopover>custom template</ng-template>
180-
<button [nPopover]='customPopover'>Pop over right</button>
180+
<button [ibmPopover]='customPopover'>Pop over right</button>
181181
`
182182
}
183183
});
@@ -207,7 +207,7 @@ describe("Popover directive", () => {
207207
</ng-template>
208208
209209
<button class="btn--icon-link"
210-
[nPopover]="filter"
210+
[ibmPopover]="filter"
211211
title="Popover filter"
212212
placement="left"
213213
[data]="userData"

src/dialog/popover/popover.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import { DialogService } from "./../dialog.service";
6161
* @extends {DialogDirective}
6262
*/
6363
@Directive({
64-
selector: "[nPopover]",
64+
selector: "[ibmPopover]",
6565
exportAs: "nPopover",
6666
providers: [
6767
DialogService

src/dialog/tooltip/ellipsis-tooltip.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { Tooltip } from "./tooltip.component";
2828
* @extends {TooltipDirective}
2929
*/
3030
@Directive({
31-
selector: "[nEllipsisTooltip]",
31+
selector: "[ibmEllipsisTooltip]",
3232
providers: [
3333
DialogService
3434
]

src/dialog/tooltip/tooltip.directive.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ describe("Tooltip directive", () => {
169169
set: {
170170
template: `
171171
<ng-template #customPopover>custom template</ng-template>
172-
<button [nTooltip]='customPopover'>Pop over right</button>
172+
<button [ibmTooltip]='customPopover'>Pop over right</button>
173173
`
174174
}
175175
});

src/dialog/tooltip/tooltip.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { DialogService } from "./../dialog.service";
3131
* @extends {DialogDirective}
3232
*/
3333
@Directive({
34-
selector: "[nTooltip]",
34+
selector: "[ibmTooltip]",
3535
exportAs: "nTooltip",
3636
providers: [
3737
DialogService

src/dropdown/scrollable-list.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from "@angular/core";
1212

1313
@Directive({
14-
selector: "[nScrollableList]",
14+
selector: "[ibmScrollableList]",
1515
exportAs: "scrollable-list",
1616
})
1717
export class ScrollableList implements OnChanges, AfterViewInit {

0 commit comments

Comments
 (0)