From f1b78d4c5f70f4168e86d72a9efb1a1eb60d222b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:34:09 +0200
Subject: [PATCH] compat: selection list not working in compatibility mode
 (#6801)

Fixes the selection list not working in M1 compatibility mode.

Fixes #6746.
---
 src/lib/list/list-option.html  | 18 ++++++++++++------
 src/lib/list/selection-list.ts |  6 ++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/lib/list/list-option.html b/src/lib/list/list-option.html
index e96faa23f06d..be563650414c 100644
--- a/src/lib/list/list-option.html
+++ b/src/lib/list/list-option.html
@@ -1,10 +1,16 @@
-<div class="mat-list-item-content"  [class.mat-list-item-content-reverse]="checkboxPosition == 'after'" [class.mat-list-item-disabled]="disabled">
-  <div class="mat-list-item-ripple" md-ripple
-       [mdRippleTrigger]="_getHostElement()"
-       [mdRippleDisabled]="_isRippleDisabled()">
-  </div>
+<div class="mat-list-item-content"
+  [class.mat-list-item-content-reverse]="checkboxPosition == 'after'"
+  [class.mat-list-item-disabled]="disabled">
+
+  <div md-ripple
+    class="mat-list-item-ripple"
+    [mdRippleTrigger]="_getHostElement()"
+    [mdRippleDisabled]="_isRippleDisabled()"></div>
+
+  <md-pseudo-checkbox #autocheckbox
+    [state]="selected ? 'checked' : 'unchecked'"
+    [disabled]="disabled"></md-pseudo-checkbox>
 
-  <md-pseudo-checkbox [state]="selected ? 'checked' : 'unchecked'" #autocheckbox [disabled]="disabled"></md-pseudo-checkbox>
   <div class="mat-list-text"><ng-content></ng-content></div>
 
 </div>
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 1e097ebdde1a..beaf0ede3759 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -33,6 +33,8 @@ import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
 import {RxChain, switchMap, startWith} from '../core/rxjs/index';
 import {merge} from 'rxjs/observable/merge';
 import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {MATERIAL_COMPATIBILITY_MODE} from '../core/compatibility/compatibility';
+
 
 export class MdSelectionListBase {}
 export const _MdSelectionListMixinBase = mixinDisableRipple(mixinDisabled(MdSelectionListBase));
@@ -68,14 +70,14 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
   },
   templateUrl: 'list-option.html',
   encapsulation: ViewEncapsulation.None,
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}],
 })
 export class MdListOption extends _MdListOptionMixinBase
     implements AfterContentInit, OnDestroy, FocusableOption, CanDisableRipple {
 
   private _lineSetter: MdLineSetter;
   private _selected: boolean = false;
-  /** Whether the checkbox is disabled. */
   private _disabled: boolean = false;
   private _value: any;