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

chore(progress-spinner): remove md-progress-circle alias #3735

Merged
merged 1 commit into from
Mar 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<md-card>
<md-card-content>
<h2 class="example-h2">Progress circle configuration</h2>
<h2 class="example-h2">Progress spinner configuration</h2>

<section class="example-section">
<label class="example-margin">Color:</label>
Expand Down Expand Up @@ -39,11 +39,11 @@ <h2 class="example-h2">Progress circle configuration</h2>
<md-card-content>
<h2 class="example-h2">Result</h2>

<md-progress-circle
<md-progress-spinner
class="example-margin"
[attr.color]="color"
[mode]="mode"
[value]="value">
</md-progress-circle>
</md-progress-spinner>
</md-card-content>
</md-card>
2 changes: 0 additions & 2 deletions src/lib/core/compatibility/compatibility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export const MAT_ELEMENTS_SELECTOR = `
mat-option,
mat-placeholder,
mat-progress-bar,
mat-progress-circle,
mat-pseudo-checkbox,
mat-radio-button,
mat-radio-group,
Expand Down Expand Up @@ -119,7 +118,6 @@ export const MD_ELEMENTS_SELECTOR = `
md-option,
md-placeholder,
md-progress-bar,
md-progress-circle,
md-pseudo-checkbox,
md-radio-button,
md-radio-group,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/progress-spinner/_progress-spinner-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
$accent: map-get($theme, accent);
$warn: map-get($theme, warn);

.mat-progress-spinner, .mat-progress-circle, .mat-spinner {
.mat-progress-spinner, .mat-spinner {
path {
stroke: mat-color($primary, 600);
}
Expand Down
11 changes: 2 additions & 9 deletions src/lib/progress-spinner/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
MdProgressSpinner,
MdSpinner,
MdProgressSpinnerCssMatStyler,
MdProgressCircleCssMatStyler
} from './progress-spinner';


Expand All @@ -14,14 +13,12 @@ import {
MdProgressSpinner,
MdSpinner,
CompatibilityModule,
MdProgressSpinnerCssMatStyler,
MdProgressCircleCssMatStyler
MdProgressSpinnerCssMatStyler
],
declarations: [
MdProgressSpinner,
MdSpinner,
MdProgressSpinnerCssMatStyler,
MdProgressCircleCssMatStyler
MdProgressSpinnerCssMatStyler
],
})
class MdProgressSpinnerModule {
Expand All @@ -36,7 +33,3 @@ class MdProgressSpinnerModule {

export {MdProgressSpinnerModule};
export * from './progress-spinner';

/** @deprecated */
export {MdProgressSpinnerModule as MdProgressCircleModule};
export {MdProgressSpinner as MdProgressCircle};
2 changes: 1 addition & 1 deletion src/lib/progress-spinner/progress-spinner.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
preserveAspectRatio of xMidYMid meet as the center of the viewport is the circle's
center. The center of the circle with remain at the center of the md-progress-circle
center. The center of the circle will remain at the center of the md-progress-spinner
element containing the SVG.
-->
<svg viewBox="0 0 100 100"
Expand Down
15 changes: 1 addition & 14 deletions src/lib/progress-spinner/progress-spinner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,12 @@ type EasingFn = (currentTime: number, startValue: number,
export class MdProgressSpinnerCssMatStyler {}


/**
* Directive whose purpose is to add the mat- CSS styling to this selector.
* @docs-private
*/
@Directive({
selector: 'md-progress-circle, mat-progress-circle',
host: {
'[class.mat-progress-circle]': 'true'
}
})
export class MdProgressCircleCssMatStyler {}


/**
* <md-progress-spinner> component.
*/
@Component({
moduleId: module.id,
selector: 'md-progress-spinner, mat-progress-spinner, md-progress-circle, mat-progress-circle',
selector: 'md-progress-spinner, mat-progress-spinner',
host: {
'role': 'progressbar',
'[attr.aria-valuemin]': '_ariaValueMin',
Expand Down