From 204ecd98428350f1e1cfc3c80355e181ea91926b Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Mon, 4 Sep 2017 17:24:15 +0100
Subject: [PATCH] Remove MDL from input field and use MD (#2289)

---
 .../src/components/checklist.component.css     |  4 ++++
 .../src/components/checklist.component.html    |  7 +++----
 .../src/components/checklist.component.ts      | 18 ++----------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.css b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.css
index 00d4c682f8..81fcf6f133 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.css
+++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.css
@@ -17,3 +17,7 @@
 .material-icons {
     cursor: pointer;
 }
+
+.mat-input-container {
+    width: 100%;
+}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
index f62128faab..820d57ceff 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
@@ -23,10 +23,9 @@
 <dialog class="mdl-dialog" id="checklist-dialog" #dialog>
     <h4 class="mdl-dialog__title" id="add-checklist-title">New Check</h4>
     <div class="mdl-dialog__content">
-        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-            <input class="mdl-textfield__input" type="text" [(ngModel)]="taskName" id="checklist-name"/>
-            <label class="mdl-textfield__label" for="checklist-name">Name</label>
-        </div>
+        <md-input-container>
+            <input mdInput placeholder="Name" [(ngModel)]="taskName" id="checklist-name"  data-automation-id="checklist-name">
+        </md-input-container>
     </div>
     <div class="mdl-dialog__actions">
         <button type="button" id="add-check" (click)="add()" class="mdl-button">Add Checklist</button>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts
index 887cd4556a..8673040efc 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-import { AfterViewInit, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
 import { Observable, Observer } from 'rxjs/Rx';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListService } from './../services/tasklist.service';
 
 declare let dialogPolyfill: any;
-let componentHandler: any;
 
 @Component({
     selector: 'adf-checklist, activiti-checklist',
@@ -29,7 +28,7 @@ let componentHandler: any;
     styleUrls: ['./checklist.component.css'],
     providers: [TaskListService]
 })
-export class ChecklistComponent implements OnInit, OnChanges, AfterViewInit {
+export class ChecklistComponent implements OnInit, OnChanges {
 
     @Input()
     taskId: string;
@@ -82,19 +81,6 @@ export class ChecklistComponent implements OnInit, OnChanges, AfterViewInit {
         }
     }
 
-    ngAfterViewInit() {
-        this.setupMaterialComponents(componentHandler);
-    }
-
-    setupMaterialComponents(handler?: any): boolean {
-        // workaround for MDL issues with dynamic components
-        if (handler) {
-            handler.upgradeAllRegistered();
-            return true;
-        }
-        return false;
-    }
-
     public getTaskChecklist(taskId: string) {
         this.checklist = [];
         if (this.taskId) {