Merged master

UrionBlade · Sep 10, 2018 · 7a8e093 · 7a8e093
2 parents fb934a4 + 1e5ea8b
commit 7a8e093
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/src/app/components/mqtt-client/mqtt-client.component.html b/src/app/components/mqtt-client/mqtt-client.component.html
@@ -137,21 +137,16 @@
           {{ 'PAGES.BUTTONS.DELETE' | translate }}
         </button>
       </span>
-      <mat-drawer-container class="example-container">
-        <mat-drawer class="drawer" #drawer>
-          <perfect-scrollbar>      
-            <mat-list infiniteScroll
-                [infiniteScrollDistance]="2"
-                [infiniteScrollThrottle]="50"
-                [fromRoot]="true">
-              <mat-list-item  *ngFor="let message of messages; let in = index">
-              <span  class="buttons"> <button class="btn-cripto" [ngx-scroll-to]="'opened'"mat-button class="topic" (click)="openMessage(in)"><mat-icon class="icon-text" fontSet="far" fontIcon="fa-envelope"></mat-icon>{{ in }} :   {{ message.topic }} </button></span>
-              </mat-list-item>
-            </mat-list>
-          </perfect-scrollbar>
-        </mat-drawer>
-      </mat-drawer-container>
-
+        <div class="topic-list" id="topic-list">          
+          <mat-list infiniteScroll
+              [infiniteScrollDistance]="2"
+              [infiniteScrollThrottle]="50"
+              [fromRoot]="true">
+            <mat-list-item  *ngFor="let message of messages; let in = index">
+            <span  class="buttons"> <button class="btn-cripto" [ngx-scroll-to]="'opened'"mat-button class="topic" (click)="openMessage(in)"><mat-icon class="icon-text" fontSet="far" fontIcon="fa-envelope"></mat-icon>{{ in }} :   {{ message.topic }} </button></span>
+            </mat-list-item>
+          </mat-list>
+        </div>
     </mat-card-actions>
   </mat-card-content>
 

diff --git a/src/app/components/mqtt-client/mqtt-client.component.scss b/src/app/components/mqtt-client/mqtt-client.component.scss
@@ -97,4 +97,14 @@ pre {
     width: 20px !important;
     max-width: 20px !important;
     min-width: 20px !important;
-}
+}
+
+.topic-list {
+    margin-left: 20px;
+    margin-right: 20px;
+    margin-top: 20px;
+    min-height: 400px;
+    max-height: 400px;
+    background-color: #212121;
+    overflow: auto;
+  }
diff --git a/src/app/components/mqtt-client/mqtt-client.component.ts b/src/app/components/mqtt-client/mqtt-client.component.ts
@@ -265,6 +265,8 @@ export class MqttClientComponent implements OnInit {
         const mess: Messages = new Messages(message, topic.toString())
         self.messages = [...self.messages, mess]
         self.cd.detectChanges()
+        const objDiv = document.getElementById('topic-list')
+        objDiv.scrollTop = objDiv.scrollHeight
       })
       .on('connect', (packet) => {
         console.log('connected!', JSON.stringify(packet))