From dc104b0e8ea48f10401e423181ad68a86a98e16e Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Wed, 25 May 2016 16:47:38 -0700 Subject: [PATCH] chore: rename "tab-group" to "tabs" (#528) --- src/components/{tab-group => tabs}/ink-bar.ts | 0 src/components/tabs/package.json | 26 +++++++++++++++++++ .../{tab-group => tabs}/tab-content.ts | 0 .../{tab-group => tabs}/tab-group.html | 0 .../{tab-group => tabs}/tab-group.scss | 0 .../{tab-group => tabs}/tab-group.spec.ts | 4 +-- .../{tab-group => tabs}/tab-label-wrapper.ts | 0 .../{tab-group => tabs}/tab-label.ts | 0 .../{tab-group/tab-group.ts => tabs/tabs.ts} | 2 +- src/demo-app/demo-app/demo-app.html | 2 +- src/demo-app/demo-app/demo-app.ts | 4 +-- src/demo-app/system-config.ts | 2 +- .../{tab-group => tabs}/tab-group-demo.html | 0 .../{tab-group => tabs}/tab-group-demo.scss | 0 .../{tab-group => tabs}/tab-group-demo.ts | 6 ++--- src/e2e-app/system-config.ts | 2 +- typings.json | 1 - 17 files changed, 37 insertions(+), 12 deletions(-) rename src/components/{tab-group => tabs}/ink-bar.ts (100%) create mode 100644 src/components/tabs/package.json rename src/components/{tab-group => tabs}/tab-content.ts (100%) rename src/components/{tab-group => tabs}/tab-group.html (100%) rename src/components/{tab-group => tabs}/tab-group.scss (100%) rename src/components/{tab-group => tabs}/tab-group.spec.ts (97%) rename src/components/{tab-group => tabs}/tab-label-wrapper.ts (100%) rename src/components/{tab-group => tabs}/tab-label.ts (100%) rename src/components/{tab-group/tab-group.ts => tabs/tabs.ts} (97%) rename src/demo-app/{tab-group => tabs}/tab-group-demo.html (100%) rename src/demo-app/{tab-group => tabs}/tab-group-demo.scss (100%) rename src/demo-app/{tab-group => tabs}/tab-group-demo.ts (78%) diff --git a/src/components/tab-group/ink-bar.ts b/src/components/tabs/ink-bar.ts similarity index 100% rename from src/components/tab-group/ink-bar.ts rename to src/components/tabs/ink-bar.ts diff --git a/src/components/tabs/package.json b/src/components/tabs/package.json new file mode 100644 index 00000000000..ad06eb5a970 --- /dev/null +++ b/src/components/tabs/package.json @@ -0,0 +1,26 @@ +{ + "name": "@angular2-material/tabs", + "version": "2.0.0-alpha.5", + "description": "Angular 2 Material Slide Toggle", + "main": "./tabs.js", + "typings": "./tabs.d.ts", + "repository": { + "type": "git", + "url": "https://github.com/angular/material2.git" + }, + "keywords": [ + "angular", + "material", + "material design", + "components", + "tabs" + ], + "license": "MIT", + "bugs": { + "url": "https://github.com/angular/material2/issues" + }, + "homepage": "https://github.com/angular/material2#readme", + "peerDependencies": { + "@angular2-material/core": "2.0.0-alpha.4" + } +} diff --git a/src/components/tab-group/tab-content.ts b/src/components/tabs/tab-content.ts similarity index 100% rename from src/components/tab-group/tab-content.ts rename to src/components/tabs/tab-content.ts diff --git a/src/components/tab-group/tab-group.html b/src/components/tabs/tab-group.html similarity index 100% rename from src/components/tab-group/tab-group.html rename to src/components/tabs/tab-group.html diff --git a/src/components/tab-group/tab-group.scss b/src/components/tabs/tab-group.scss similarity index 100% rename from src/components/tab-group/tab-group.scss rename to src/components/tabs/tab-group.scss diff --git a/src/components/tab-group/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts similarity index 97% rename from src/components/tab-group/tab-group.spec.ts rename to src/components/tabs/tab-group.spec.ts index 557f419be80..e53868c4a97 100644 --- a/src/components/tab-group/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -7,7 +7,7 @@ import { async } from '@angular/core/testing'; import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; -import {MD_TAB_GROUP_DIRECTIVES, MdTabGroup} from './tab-group'; +import {MD_TABS_DIRECTIVES, MdTabGroup} from './tabs'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -125,7 +125,7 @@ describe('MdTabGroup', () => { `, - directives: [MD_TAB_GROUP_DIRECTIVES] + directives: [MD_TABS_DIRECTIVES] }) class SimpleTabsTestApp { selectedIndex: number = 1; diff --git a/src/components/tab-group/tab-label-wrapper.ts b/src/components/tabs/tab-label-wrapper.ts similarity index 100% rename from src/components/tab-group/tab-label-wrapper.ts rename to src/components/tabs/tab-label-wrapper.ts diff --git a/src/components/tab-group/tab-label.ts b/src/components/tabs/tab-label.ts similarity index 100% rename from src/components/tab-group/tab-label.ts rename to src/components/tabs/tab-label.ts diff --git a/src/components/tab-group/tab-group.ts b/src/components/tabs/tabs.ts similarity index 97% rename from src/components/tab-group/tab-group.ts rename to src/components/tabs/tabs.ts index 0eb44aab71c..a630d350243 100644 --- a/src/components/tab-group/tab-group.ts +++ b/src/components/tabs/tabs.ts @@ -113,4 +113,4 @@ export class MdTabGroup { } } -export const MD_TAB_GROUP_DIRECTIVES = [MdTabGroup, MdTabLabel, MdTabContent]; +export const MD_TABS_DIRECTIVES = [MdTabGroup, MdTabLabel, MdTabContent]; diff --git a/src/demo-app/demo-app/demo-app.html b/src/demo-app/demo-app/demo-app.html index 5e79da12437..ec92e9bea76 100644 --- a/src/demo-app/demo-app/demo-app.html +++ b/src/demo-app/demo-app/demo-app.html @@ -18,7 +18,7 @@ Sidenav Slide Toggle Toolbar - Tab Group + Tabs diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts index 6cd15e0a022..d7e47e9490c 100644 --- a/src/demo-app/demo-app/demo-app.ts +++ b/src/demo-app/demo-app/demo-app.ts @@ -24,7 +24,7 @@ import {InputDemo} from '../input/input-demo'; import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo'; import {GesturesDemo} from '../gestures/gestures-demo'; import {GridListDemo} from '../grid-list/grid-list-demo'; -import {TabGroupDemo} from '../tab-group/tab-group-demo'; +import {TabsDemo} from '../tabs/tab-group-demo'; import {SlideToggleDemo} from '../slide-toggle/slide-toggle-demo'; @Component({ @@ -72,6 +72,6 @@ export class Home {} new Route({path: '/live-announcer', component: LiveAnnouncerDemo}), new Route({path: '/gestures', component: GesturesDemo}), new Route({path: '/grid-list', component: GridListDemo}), - new Route({path: '/tab-group', component: TabGroupDemo}) + new Route({path: '/tabs', component: TabsDemo}) ]) export class DemoApp { } diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts index d310607fd98..70a392b66f6 100644 --- a/src/demo-app/system-config.ts +++ b/src/demo-app/system-config.ts @@ -18,7 +18,7 @@ const components = [ 'radio', 'sidenav', 'slide-toggle', - 'tab-group', + 'tabs', 'toolbar' ]; diff --git a/src/demo-app/tab-group/tab-group-demo.html b/src/demo-app/tabs/tab-group-demo.html similarity index 100% rename from src/demo-app/tab-group/tab-group-demo.html rename to src/demo-app/tabs/tab-group-demo.html diff --git a/src/demo-app/tab-group/tab-group-demo.scss b/src/demo-app/tabs/tab-group-demo.scss similarity index 100% rename from src/demo-app/tab-group/tab-group-demo.scss rename to src/demo-app/tabs/tab-group-demo.scss diff --git a/src/demo-app/tab-group/tab-group-demo.ts b/src/demo-app/tabs/tab-group-demo.ts similarity index 78% rename from src/demo-app/tab-group/tab-group-demo.ts rename to src/demo-app/tabs/tab-group-demo.ts index 7e79d2b5fad..5e7c6c9cf69 100644 --- a/src/demo-app/tab-group/tab-group-demo.ts +++ b/src/demo-app/tabs/tab-group-demo.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from '@angular/core'; -import {MD_TAB_GROUP_DIRECTIVES} from '@angular2-material/tab-group/tab-group'; +import {MD_TABS_DIRECTIVES} from '@angular2-material/tabs/tabs'; import {MdToolbar} from '@angular2-material/toolbar/toolbar'; import {MdInput} from '@angular2-material/input/input'; @@ -8,10 +8,10 @@ import {MdInput} from '@angular2-material/input/input'; selector: 'tab-group-demo', templateUrl: 'tab-group-demo.html', styleUrls: ['tab-group-demo.css'], - directives: [MD_TAB_GROUP_DIRECTIVES, MdToolbar, MdInput], + directives: [MD_TABS_DIRECTIVES, MdToolbar, MdInput], encapsulation: ViewEncapsulation.None, }) -export class TabGroupDemo { +export class TabsDemo { tabs = [ { label: 'Tab One', content: 'This is the body of the first tab' }, { label: 'Tab Two', content: 'This is the body of the second tab' }, diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts index d310607fd98..70a392b66f6 100644 --- a/src/e2e-app/system-config.ts +++ b/src/e2e-app/system-config.ts @@ -18,7 +18,7 @@ const components = [ 'radio', 'sidenav', 'slide-toggle', - 'tab-group', + 'tabs', 'toolbar' ]; diff --git a/typings.json b/typings.json index bc4fc833ae0..56838d905d3 100644 --- a/typings.json +++ b/typings.json @@ -7,7 +7,6 @@ }, "globalDependencies": { "core-js": "registry:dt/core-js#0.0.0+20160317120654", - "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654", "hammerjs": "registry:dt/hammerjs#2.0.4+20160417130828" } }