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

Merge pull request #2056 from crazyserver/MOBILE-3068 

Mobile 3068
main
Juan Leyva 2019-08-14 10:33:15 +01:00 committed by GitHub
parent 8327a21f13 b304bdfc3e
commit e9999c6cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/calendar/pages/edit-event/edit-event.ts
View File

@ -423,7 +423,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
submit(): void { submit(): void {
// Validate data. // Validate data.
const formData = this.eventForm.value, const formData = this.eventForm.value,
timeStartDate = this.timeUtils.datetimeToDate(formData.timestart), timeStartDate = new Date(formData.timestart),
timeUntilDate = this.timeUtils.datetimeToDate(formData.timedurationuntil), timeUntilDate = this.timeUtils.datetimeToDate(formData.timedurationuntil),
timeDurationMinutes = parseInt(formData.timedurationminutes || '', 10); timeDurationMinutes = parseInt(formData.timedurationminutes || '', 10);
let error; let error;

3
src/addon/calendar/pages/index/index.scss 100644
View File

@ -0,0 +1,3 @@
page-addon-calendar-index .toolbar-ios ion-title {
@include padding-horizontal(null, 120px);
}

9
src/addon/calendar/providers/calendar.ts
View File

@ -1176,10 +1176,15 @@ export class AddonCalendarProvider {
const data: any = { const data: any = {
year: year, year: year,
month: month, month: month
mini: 1 // Set mini to 1 to prevent returning the course selector HTML.
}; };
// This parameter requires Moodle 3.5.
if ( site.isVersionGreaterEqualThan('3.5')) {
// Set mini to 1 to prevent returning the course selector HTML.
data.mini = 1;
}
if (courseId) { if (courseId) {
data.courseid = courseId; data.courseid = courseId;
} }

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

@ -160,7 +160,6 @@ 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;
} }
@ -199,7 +198,6 @@ 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);
}); });
} }