From 9fe98a11eea07a9e54e2cb517b120603f7bf9cc6 Mon Sep 17 00:00:00 2001
From: Andy Dvorak <advorak@google.com>
Date: Thu, 11 Jan 2018 16:35:43 -0800
Subject: [PATCH 1/2] fix(demos): Fix NPEs in drawer demos

---
 demos/drawer/permanent-drawer-above-toolbar.html | 4 ++--
 demos/drawer/permanent-drawer-below-toolbar.html | 4 ++--
 demos/drawer/persistent-drawer.html              | 4 ++--
 demos/drawer/temporary-drawer.html               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/demos/drawer/permanent-drawer-above-toolbar.html b/demos/drawer/permanent-drawer-above-toolbar.html
index e13807db440..a0c8a884b7f 100644
--- a/demos/drawer/permanent-drawer-above-toolbar.html
+++ b/demos/drawer/permanent-drawer-above-toolbar.html
@@ -183,8 +183,8 @@ <h1 class="mdc-typography--display1">Permanent Drawer</h1>
       var activatedClass = 'mdc-list-item--selected';
       document.querySelector('.mdc-drawer').addEventListener('click', function(event) {
         var el = event.target;
-        while (!el.classList.contains('mdc-list-item') && el) {
-          el = el.parentNode;
+        while (el && !el.classList.contains('mdc-list-item')) {
+          el = el.parentElement;
         }
         if (el) {
           var activatedItem = document.querySelector('.' + activatedClass);
diff --git a/demos/drawer/permanent-drawer-below-toolbar.html b/demos/drawer/permanent-drawer-below-toolbar.html
index 01f8cd24569..8f858a3b05f 100644
--- a/demos/drawer/permanent-drawer-below-toolbar.html
+++ b/demos/drawer/permanent-drawer-below-toolbar.html
@@ -175,8 +175,8 @@ <h1 class="mdc-typography--display1">Permanent Drawer</h1>
       var activatedClass = 'mdc-list-item--selected';
       document.querySelector('.mdc-drawer').addEventListener('click', function(event) {
         var el = event.target;
-        while (!el.classList.contains('mdc-list-item') && el) {
-          el = el.parentNode;
+        while (el && !el.classList.contains('mdc-list-item')) {
+          el = el.parentElement;
         }
         if (el) {
           var activatedItem = document.querySelector('.' + activatedClass);
diff --git a/demos/drawer/persistent-drawer.html b/demos/drawer/persistent-drawer.html
index 81b2a39db99..9f4ff708625 100644
--- a/demos/drawer/persistent-drawer.html
+++ b/demos/drawer/persistent-drawer.html
@@ -163,8 +163,8 @@ <h1 class="mdc-typography--display1">Persistent Drawer</h1>
         var activatedClass = 'mdc-list-item--selected';
         document.querySelector('.mdc-drawer__drawer').addEventListener('click', function(event) {
           var el = event.target;
-          while (!el.classList.contains('mdc-list-item') && el) {
-            el = el.parentNode;
+          while (el && !el.classList.contains('mdc-list-item')) {
+            el = el.parentElement;
           }
           if (el) {
             var activatedItem = document.querySelector('.' + activatedClass);
diff --git a/demos/drawer/temporary-drawer.html b/demos/drawer/temporary-drawer.html
index de285fb4df3..2f1da5c1b75 100644
--- a/demos/drawer/temporary-drawer.html
+++ b/demos/drawer/temporary-drawer.html
@@ -147,8 +147,8 @@ <h1 class="mdc-typography--display1">Temporary Drawer</h1>
       var activatedClass = 'mdc-list-item--selected';
       document.querySelector('.mdc-drawer__drawer').addEventListener('click', function(event) {
         var el = event.target;
-        while (!el.classList.contains('mdc-list-item') && el) {
-          el = el.parentNode;
+        while (el && !el.classList.contains('mdc-list-item')) {
+          el = el.parentElement;
         }
         if (el) {
           var activatedItem = document.querySelector('.' + activatedClass);

From 5a3eee3ed5a7374aa0ee20fe5de1f84b62920fd3 Mon Sep 17 00:00:00 2001
From: Andy Dvorak <advorak@google.com>
Date: Tue, 16 Jan 2018 11:47:09 -0800
Subject: [PATCH 2/2] WIP: Fix borked auto-merge

---
 demos/drawer/persistent-drawer.html | 2 +-
 demos/drawer/temporary-drawer.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/drawer/persistent-drawer.html b/demos/drawer/persistent-drawer.html
index 0353ea0b0a1..f9c52b9a730 100644
--- a/demos/drawer/persistent-drawer.html
+++ b/demos/drawer/persistent-drawer.html
@@ -166,7 +166,7 @@ <h1 class="mdc-typography--display1">Persistent Drawer</h1>
           document.querySelector('.mdc-drawer__drawer').addEventListener('click', function(event) {
             var el = event.target;
             while (el && !el.classList.contains('mdc-list-item')) {
-              el = el.parentNode;
+              el = el.parentElement;
             }
             if (el) {
               var activatedItem = document.querySelector('.' + activatedClass);
diff --git a/demos/drawer/temporary-drawer.html b/demos/drawer/temporary-drawer.html
index 139fe1e116f..63f586dda57 100644
--- a/demos/drawer/temporary-drawer.html
+++ b/demos/drawer/temporary-drawer.html
@@ -150,7 +150,7 @@ <h1 class="mdc-typography--display1">Temporary Drawer</h1>
         document.querySelector('.mdc-drawer__drawer').addEventListener('click', function(event) {
           var el = event.target;
           while (el && !el.classList.contains('mdc-list-item')) {
-            el = el.parentNode;
+            el = el.parentElement;
           }
           if (el) {
             var activatedItem = document.querySelector('.' + activatedClass);