diff --git a/.travis.yml b/.travis.yml index 78c25e4c0a..44ca347831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready - LOGS_DIR=/tmp/logs - CY_KEY=4aa7a1c0-3a4f-444e-b324-6fc305a543a8 + - NPM_AUTH_TOKEN_CI_PR=810c9089-b5e8-4348-8c89-61a1c2461d68 # test cypress smoke testSmokeCy: &testSmokeCy @@ -81,6 +82,7 @@ jobs: - npm ci - npm run build - npm run ci:update-pkg + - if [[ "$TRAVIS_PULL_REQUEST" != false ]]; then export NPM_AUTH_TOKEN_CI=$NPM_AUTH_TOKEN_CI_PR; fi - npm config set '//registry.npmjs.org/:_authToken' $NPM_AUTH_TOKEN_CI - cd dist - npm publish --tag $TRAVIS_COMMIT @@ -136,7 +138,7 @@ jobs: - npm config set '//registry.npmjs.org/:_authToken' $NPM_AUTH_TOKEN_CI - npm unpublish --tag $TRAVIS_COMMIT --force - # deploy to ngx-bootstrap.surge.sh + # deploy to ngx-bootstrap.surge.sh - &surge stage: deploy script: npm run demo.build @@ -159,7 +161,7 @@ jobs: project: ./gh-pages/ domain: ngx-bootstrap-next.surge.sh on: development - # deploy to ngx-universal.herokuapp.com/ + # deploy to ngx-universal.herokuapp.com/ - stage: deploy script: npm run build:dynamic before_deploy: diff --git a/demo/src/app/components/+tabs/demos/dynamic/dynamic.html b/demo/src/app/components/+tabs/demos/dynamic/dynamic.html index e6b7e7a973..6aa00c23e7 100644 --- a/demo/src/app/components/+tabs/demos/dynamic/dynamic.html +++ b/demo/src/app/components/+tabs/demos/dynamic/dynamic.html @@ -12,7 +12,7 @@ Event select is fired. The heading of the selected tab is: {{value}} - +

Title

Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.

- +

Title 2

It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of diff --git a/demo/src/ng-api-doc.ts b/demo/src/ng-api-doc.ts index 4a8aa4a438..056db691e3 100644 --- a/demo/src/ng-api-doc.ts +++ b/demo/src/ng-api-doc.ts @@ -2918,8 +2918,8 @@ export const ngdoc: any = { "description": "

fired before tab will be removed, $event:Tab equals to instance of removed tab

\n" }, { - "name": "select", - "description": "

fired when tab became active, $event:Tab equals to selected instance of Tab component

\n" + "name": "selectTab", + "description": "

fired when tab became active, $event:Tab equals to selected instance of Tab component

\n" } ], "properties": [], diff --git a/src/spec/tabset.component.spec.ts b/src/spec/tabset.component.spec.ts index c0cd5d7727..6f99d38fc1 100644 --- a/src/spec/tabset.component.spec.ts +++ b/src/spec/tabset.component.spec.ts @@ -44,7 +44,7 @@ const html = ` [customClass]="tab.customClass" [active]="tab.active" [removable]="tab.removable" - (select)="_select($event)" + (selectTab)="_select($event)" (deselect)="_deselect($event)" (removed)="_removed($event)" [heading]="tab.title">{{ tab.content }}
diff --git a/src/tabs/tab.directive.ts b/src/tabs/tab.directive.ts index 04a18d961c..4e39fcf81b 100644 --- a/src/tabs/tab.directive.ts +++ b/src/tabs/tab.directive.ts @@ -66,7 +66,7 @@ export class TabDirective implements OnInit, OnDestroy { } this._active = active; - this.select.emit(this); + this.selectTab.emit(this); this.tabset.tabs.forEach((tab: TabDirective) => { if (tab !== this) { tab.active = false; @@ -75,7 +75,7 @@ export class TabDirective implements OnInit, OnDestroy { } /** fired when tab became active, $event:Tab equals to selected instance of Tab component */ - @Output() select: EventEmitter = new EventEmitter(); + @Output() selectTab: EventEmitter = new EventEmitter(); /** fired when tab became inactive, $event:Tab equals to deselected instance of Tab component */ @Output() deselect: EventEmitter = new EventEmitter(); /** fired before tab will be removed, $event:Tab equals to instance of removed tab */