From cf8998dd5f971872681ae93666a21cd22cd1e9c0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 22 Aug 2018 13:44:39 +0200
Subject: [PATCH] MOBILE-2555 core: Remove clean HTML from forum list and more

---
 .../pages/issued-badge/issued-badge.html      |  2 +-
 .../index/addon-mod-forum-index.html          |  4 +--
 .../core-courses-course-progress.html         |  2 +-
 src/core/login/pages/sites/sites.html         |  2 +-
 src/directives/format-text.ts                 | 27 ++++++++++---------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/addon/badges/pages/issued-badge/issued-badge.html b/src/addon/badges/pages/issued-badge/issued-badge.html
index 73746a741..65491218d 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.html
+++ b/src/addon/badges/pages/issued-badge/issued-badge.html
@@ -65,7 +65,7 @@
             <ion-item text-wrap *ngIf="course.fullname">
                 <h2>{{ 'core.course' | translate}}</h2>
                 <p>
-                    <core-format-text clean="true" [text]="course.fullname"></core-format-text>
+                    <core-format-text [text]="course.fullname"></core-format-text>
                 </p>
             </ion-item>
         </ion-item-group>
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 8b8164d34..77cecb34d 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -40,7 +40,7 @@
                         <ion-note text-right *ngIf="discussion.groupname">
                             <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
                         </ion-note>
-                        <p><core-format-text [clean]="true" [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text></p>
+                        <p><core-format-text [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text></p>
                     </ion-card-content>
                 </ion-card>
                 <ion-card *ngFor="let discussion of discussions" (click)="openDiscussion(discussion)" [class.addon-forum-discussion-selected]="discussion.discussion == selectedDiscussion">
@@ -58,7 +58,7 @@
                         </p>
                     </ion-item>
                     <ion-card-content>
-                        <core-format-text [clean]="true" [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text>
+                        <core-format-text [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text>
                     </ion-card-content>
                     <ion-row text-center>
                         <ion-col *ngIf="discussion.groupname">
diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html
index ab4283ace..2e70deeca 100644
--- a/src/core/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/courses/components/course-progress/core-courses-course-progress.html
@@ -17,7 +17,7 @@
     <ion-item text-wrap *ngIf="course.summary && course.summary.length">
         <p>
             <summary>
-                <core-format-text [text]="course.summary" singleLine="true" clean="true"></core-format-text>
+                <core-format-text [text]="course.summary" [singleLine]="true" [clean]="true" [fullOnClick]="true"></core-format-text>
             </summary>
         </p>
     </ion-item>
diff --git a/src/core/login/pages/sites/sites.html b/src/core/login/pages/sites/sites.html
index 5caca3ac3..ffe217791 100644
--- a/src/core/login/pages/sites/sites.html
+++ b/src/core/login/pages/sites/sites.html
@@ -16,7 +16,7 @@
                 <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
             </ion-avatar>
             <h2>{{site.fullName}}</h2>
-            <p><core-format-text [text]="site.siteName" clean="true" watch="true" [siteId]="site.id"></core-format-text></p>
+            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></p>
             <p>{{site.siteUrl}}</p>
             <ion-badge item-end *ngIf="!showDelete && site.badge">{{site.badge}}</ion-badge>
             <button *ngIf="showDelete" item-end ion-button icon-only clear color="danger" (click)="deleteSite($event, idx)" [attr.aria-label]="'core.delete' | translate">
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 4a3c9166e..6f0c824c7 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -52,12 +52,11 @@ export class CoreFormatTextDirective implements OnChanges {
                                  // Using this parameter will force display: block to calculate height better.
                                  // If you want to avoid this use class="inline" at the same time to use display: inline-block.
     @Input() fullOnClick?: boolean | string; // Whether it should open a new page with the full contents on click.
-                                             // Only if "max-height" is set and the content has been collapsed.
     @Input() fullTitle?: string; // Title to use in full view. Defaults to "Description".
     @Output() afterRender?: EventEmitter<any>; // Called when the data is rendered.
 
     protected element: HTMLElement;
-    protected clickListener;
+    protected showMoreDisplayed: boolean;
 
     constructor(element: ElementRef, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
             private textUtils: CoreTextUtilsProvider, private translate: TranslateService, private platform: Platform,
@@ -68,6 +67,8 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element = element.nativeElement;
         this.element.classList.add('opacity-hide'); // Hide contents until they're treated.
         this.afterRender = new EventEmitter();
+
+        this.element.addEventListener('click', this.elementClicked.bind(this));
     }
 
     /**
@@ -168,10 +169,10 @@ export class CoreFormatTextDirective implements OnChanges {
 
         // If cannot calculate height, shorten always.
         if (!height || height > this.maxHeight) {
-            if (!this.clickListener) {
+            if (!this.showMoreDisplayed) {
                 this.displayShowMore();
             }
-        } else if (this.clickListener) {
+        } else if (this.showMoreDisplayed) {
             this.hideShowMore();
         }
     }
@@ -194,23 +195,27 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element.classList.add('core-shortened');
         this.element.style.maxHeight = this.maxHeight + 'px';
 
-        this.clickListener = this.elementClicked.bind(this, expandInFullview);
-
-        this.element.addEventListener('click', this.clickListener);
+        this.showMoreDisplayed = true;
     }
 
     /**
      * Listener to call when the element is clicked.
      *
-     * @param {boolean}  expandInFullview Whether to expand the text in a new view.
      * @param {MouseEvent} e Click event.
      */
-    protected elementClicked(expandInFullview: boolean, e: MouseEvent): void {
+    protected elementClicked(e: MouseEvent): void {
         if (e.defaultPrevented) {
             // Ignore it if the event was prevented by some other listener.
             return;
         }
 
+        const expandInFullview = this.utils.isTrueOrOne(this.fullOnClick) || false;
+
+        if (!expandInFullview && !this.showMoreDisplayed) {
+            // Nothing to do on click, just stop.
+            return;
+        }
+
         e.preventDefault();
         e.stopPropagation();
 
@@ -442,9 +447,7 @@ export class CoreFormatTextDirective implements OnChanges {
         this.element.classList.remove('core-text-formatted');
         this.element.classList.remove('core-shortened');
         this.element.style.maxHeight = null;
-
-        this.element.removeEventListener('click', this.clickListener);
-        this.clickListener = null;
+        this.showMoreDisplayed = false;
     }
 
     /**