EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2054 from crazyserver/MOBILE-3068 

Mobile 3068
main
Juan Leyva 2019-08-12 14:47:29 +01:00 committed by GitHub
parent 85ef2a8e12 2aa37308ef
commit f8bd1359dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/addon/calendar/providers/calendar-sync.ts
View File

@ -248,6 +248,11 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider {
// Try to send the data. // Try to send the data.
const data = this.utils.clone(event); // Clone the object because it will be modified in the submit function. const data = this.utils.clone(event); // Clone the object because it will be modified in the submit function.
data.description = {
text: data.description,
format: 1
};
return this.calendarProvider.submitEventOnline(eventId > 0 ? eventId : undefined, data, siteId).then((newEvent) => { return this.calendarProvider.submitEventOnline(eventId > 0 ? eventId : undefined, data, siteId).then((newEvent) => {
result.updated = true; result.updated = true;
result.events.push(newEvent); result.events.push(newEvent);

1
src/app/app.scss
View File

@ -226,7 +226,6 @@ ion-app.app-root {
user-select: text; user-select: text;
word-break: break-word; word-break: break-word;
word-wrap: break-word; word-wrap: break-word;
white-space: normal;
&[maxHeight], &[maxHeight],
&[ng-reflect-max-height] { &[ng-reflect-max-height] {

5
src/directives/format-text.ts
View File

@ -160,6 +160,7 @@ export class CoreFormatTextDirective implements OnChanges {
*/ */
addMagnifyingGlasses(): void { addMagnifyingGlasses(): void {
const imgs = Array.from(this.element.querySelectorAll('.core-adapted-img-container > img')); const imgs = Array.from(this.element.querySelectorAll('.core-adapted-img-container > img'));
console.error(this.element, imgs);
if (!imgs.length) { if (!imgs.length) {
return; return;
} }
@ -198,6 +199,7 @@ export class CoreFormatTextDirective implements OnChanges {
this.domUtils.viewImage(imgSrc, img.getAttribute('alt'), this.component, this.componentId); this.domUtils.viewImage(imgSrc, img.getAttribute('alt'), this.component, this.componentId);
}); });
console.error(img.parentNode, anchor);
img.parentNode.appendChild(anchor); img.parentNode.appendChild(anchor);
}); });
} }
@ -339,6 +341,9 @@ export class CoreFormatTextDirective implements OnChanges {
} }
} else { } else {
this.domUtils.moveChildren(div, this.element); this.domUtils.moveChildren(div, this.element);
// Add magnifying glasses to images.
this.addMagnifyingGlasses();
} }
this.element.classList.remove('core-disable-media-adapt'); this.element.classList.remove('core-disable-media-adapt');