@@ -65,7 +65,6 @@ export class MdSlideToggle implements OnDestroy, AfterContentInit, ControlValueA
65
65
66
66
// A unique id for the slide-toggle. By default the id is auto-generated.
67
67
private _uniqueId = `md-slide-toggle-${ ++ nextId } ` ;
68
- private _checked : boolean = false ;
69
68
private _color : string ;
70
69
private _isMousedown : boolean = false ;
71
70
private _slideRenderer : SlideToggleRenderer = null ;
@@ -88,6 +87,9 @@ export class MdSlideToggle implements OnDestroy, AfterContentInit, ControlValueA
88
87
/** Whether the label should appear after or before the slide-toggle. Defaults to 'after' */
89
88
@Input ( ) labelPosition : 'before' | 'after' = 'after' ;
90
89
90
+ /** Whether the slide-toggle element is checked or not */
91
+ @Input ( ) checked : boolean = false ;
92
+
91
93
/** Used to set the aria-label attribute on the underlying input element. */
92
94
@Input ( 'aria-label' ) ariaLabel : string = null ;
93
95
@@ -138,29 +140,30 @@ export class MdSlideToggle implements OnDestroy, AfterContentInit, ControlValueA
138
140
}
139
141
140
142
/**
141
- * The onChangeEvent method will be also called on click.
142
- * This is because everything for the slide-toggle is wrapped inside of a label,
143
- * which triggers a onChange event on click.
143
+ * This function will called if the underlying input changed its value through user interaction.
144
144
*/
145
145
_onChangeEvent ( event : Event ) {
146
146
// We always have to stop propagation on the change event.
147
147
// Otherwise the change event, from the input element, will bubble up and
148
148
// emit its event object to the component's `change` output.
149
149
event . stopPropagation ( ) ;
150
150
151
- // Once a drag is currently in progress, we do not want to toggle the slide-toggle on a click.
152
- if ( ! this . disabled && ! this . _slideRenderer . dragging ) {
153
- this . toggle ( ) ;
151
+ // Sync the value from the underlying input element with the slide-toggle component.
152
+ this . checked = this . _inputElement . nativeElement . checked ;
154
153
155
- // Emit our custom change event if the native input emitted one.
156
- // It is important to only emit it, if the native input triggered one, because
157
- // we don't want to trigger a change event, when the `checked` variable changes for example.
158
- this . _emitChangeEvent ( ) ;
159
- }
154
+ // Emit our custom change event if the native input emitted one.
155
+ // It is important to only emit it, if the native input triggered one, because we don't want
156
+ // to trigger a change event, when the `checked` variable changes programmatically.
157
+ this . _emitChangeEvent ( ) ;
160
158
}
161
159
162
160
_onInputClick ( event : Event ) {
163
- this . onTouched ( ) ;
161
+ // In some situations the user will release the mouse on the label element. The label element
162
+ // redirects the click to the underlying input element and will result in a value change.
163
+ // Prevent the default behavior if dragging, because the value will be set after drag.
164
+ if ( this . _slideRenderer . dragging ) {
165
+ event . preventDefault ( ) ;
166
+ }
164
167
165
168
// We have to stop propagation for click events on the visual hidden input element.
166
169
// By default, when a user clicks on a label element, a generated click event will be
@@ -206,16 +209,6 @@ export class MdSlideToggle implements OnDestroy, AfterContentInit, ControlValueA
206
209
this . _focusOriginMonitor . focusVia ( this . _inputElement . nativeElement , this . _renderer , 'keyboard' ) ;
207
210
}
208
211
209
- /** Whether the slide-toggle is checked. */
210
- @Input ( )
211
- get checked ( ) { return ! ! this . _checked ; }
212
- set checked ( value ) {
213
- if ( this . checked !== ! ! value ) {
214
- this . _checked = value ;
215
- this . onChange ( this . _checked ) ;
216
- }
217
- }
218
-
219
212
/** The color of the slide-toggle. Can be primary, accent, or warn. */
220
213
@Input ( )
221
214
get color ( ) : string { return this . _color ; }
@@ -256,12 +249,15 @@ export class MdSlideToggle implements OnDestroy, AfterContentInit, ControlValueA
256
249
}
257
250
}
258
251
259
- /** Emits the change event to the `change` output EventEmitter */
252
+ /**
253
+ * Emits a change event on the `change` output. Also notifies the FormControl about the change.
254
+ */
260
255
private _emitChangeEvent ( ) {
261
256
let event = new MdSlideToggleChange ( ) ;
262
257
event . source = this ;
263
258
event . checked = this . checked ;
264
259
this . change . emit ( event ) ;
260
+ this . onChange ( this . checked ) ;
265
261
}
266
262
267
263
0 commit comments