From 9f3b03cbde0f67f26d737468f2b1acea8bcefb6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Jun 2018 16:18:38 +0200
Subject: [PATCH] MOBILE-2430 data: Fix size attributes on images

---
 .../component/addon-mod-data-field-picture.html        |  2 +-
 src/addon/mod/data/fields/picture/component/picture.ts | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/data/fields/picture/component/addon-mod-data-field-picture.html b/src/addon/mod/data/fields/picture/component/addon-mod-data-field-picture.html
index 267cc3a08..d0bbb6885 100644
--- a/src/addon/mod/data/fields/picture/component/addon-mod-data-field-picture.html
+++ b/src/addon/mod/data/fields/picture/component/addon-mod-data-field-picture.html
@@ -13,4 +13,4 @@
 
 <span *ngIf="mode == 'list' && imageUrl" (click)="gotoEntry.emit(entryId)"><img [src]="imageUrl" [alt]="title" [title]="title" class="core-media-adapt-width list_picture" core-external-content/></span>
 
-<img *ngIf="mode == 'show' && imageUrl" [src]="imageUrl" [alt]="title" [title]="title" class="core-media-adapt-width list_picture" [width]="width" [height]="height" core-external-content/>
+<img *ngIf="mode == 'show' && imageUrl" [src]="imageUrl" [alt]="title" [title]="title" class="core-media-adapt-width list_picture" [attr.width]="width" [attr.height]="height" core-external-content/>
diff --git a/src/addon/mod/data/fields/picture/component/picture.ts b/src/addon/mod/data/fields/picture/component/picture.ts
index a0431b197..dddf848d3 100644
--- a/src/addon/mod/data/fields/picture/component/picture.ts
+++ b/src/addon/mod/data/fields/picture/component/picture.ts
@@ -13,8 +13,9 @@
 // limitations under the License.
 import { Component } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
-import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
 import { CoreFileSessionProvider } from '@providers/file-session';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
 import { AddonModDataProvider } from '../../../providers/data';
 
 /**
@@ -38,7 +39,8 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
     width: string;
     height: string;
 
-    constructor(protected fb: FormBuilder, private fileSessionprovider: CoreFileSessionProvider) {
+    constructor(protected fb: FormBuilder, private fileSessionprovider: CoreFileSessionProvider,
+            private domUtils: CoreDomUtilsProvider) {
         super(fb);
     }
 
@@ -129,8 +131,8 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
                     this.imageUrl = (this.image && this.image.fileurl) || null;
                 }
             }
-            this.width  = this.field.param1 || '';
-            this.height = this.field.param2 || '';
+            this.width  = this.domUtils.formatPixelsSize(this.field.param1);
+            this.height = this.domUtils.formatPixelsSize(this.field.param2);
         }
     }
 }