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

Merge pull request #1493 from dpalou/MOBILE-2567 

Mobile 2567
main
Juan Leyva 2018-08-30 09:49:10 +01:00 committed by GitHub
parent b72cea5823 70ff6e608b
commit 9681430554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/course/components/format/format.scss
View File

@ -1,7 +1,7 @@
ion-badge.core-course-download-section-progress {
display: block;
@include float(start);
@include margin(12px, 12px, null, null);
@include margin(12px, 12px, null, 12px);
}
core-course-format {

2
src/core/course/providers/module-prefetch-delegate.ts
View File

@ -1087,7 +1087,7 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
}
return handler.prefetch(module, courseId).then(() => {
const index = moduleIds.indexOf(id);
const index = moduleIds.indexOf(module.id);
if (index > -1) {
// It's one of the modules we were expecting to download.
moduleIds.splice(index, 1);

2
src/core/courses/pages/my-courses/my-courses.ts
View File

@ -152,7 +152,7 @@ export class CoreCoursesMyCoursesPage implements OnDestroy {
if (this.showFilter) {
setTimeout(() => {
this.searchbar.setFocus();
});
}, 500);
}
}

2
src/core/courses/pages/my-overview/my-overview.html
View File

@ -47,8 +47,8 @@
<button *ngIf="prefetchCoursesData[courses.selected].icon && prefetchCoursesData[courses.selected].icon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourses()">
<core-icon [name]="prefetchCoursesData[courses.selected].icon"></core-icon>
</button>
<ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData[courses.selected].badge">{{prefetchCoursesData[courses.selected].badge}}</ion-badge>
<ion-spinner *ngIf="!prefetchCoursesData[courses.selected].icon || prefetchCoursesData[courses.selected].icon == 'spinner'"></ion-spinner>
<span float-end *ngIf="prefetchCoursesData[courses.selected].badge">{{prefetchCoursesData[courses.selected].badge}}</span>
</div>
</div>
<core-empty-box *ngIf="courses[courses.selected].length == 0 && courses.selected == 'inprogress'" image="assets/img/icons/courses.svg" [message]="'core.courses.nocoursesinprogress' | translate"></core-empty-box>

8
src/core/courses/pages/my-overview/my-overview.scss
View File

@ -1,3 +1,7 @@
page-core-courses-my-courses {
page-core-courses-my-overview {
ion-badge.core-course-download-courses-progress {
display: block;
@include float(start);
@include margin(12px, 12px, null, 12px);
}
}

2
src/core/courses/pages/my-overview/my-overview.ts
View File

@ -283,7 +283,7 @@ export class CoreCoursesMyOverviewPage implements OnDestroy {
if (this.showFilter) {
setTimeout(() => {
this.searchbar.setFocus();
});
}, 500);
}
}

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

@ -272,6 +272,14 @@ export class CoreFormatTextDirective implements OnChanges {
return;
}
// In AOT the inputs and ng-reflect aren't in the DOM sometimes. Add them so styles are applied.
if (this.maxHeight && !this.element.getAttribute('maxHeight')) {
this.element.setAttribute('maxHeight', String(this.maxHeight));
}
if (!this.element.getAttribute('singleLine')) {
this.element.setAttribute('singleLine', String(this.utils.isTrueOrOne(this.singleLine)));
}
this.text = this.text ? this.text.trim() : '';
this.formatContents().then((div: HTMLElement) => {
@ -281,11 +289,6 @@ export class CoreFormatTextDirective implements OnChanges {
this.element.innerHTML = ''; // Remove current contents.
if (this.maxHeight && div.innerHTML != '') {
// For some reason, in iOS the inputs and ng-reflect aren't in the DOM sometimes. Add it so styles are applied.
if (!this.element.getAttribute('maxHeight')) {
this.element.setAttribute('maxHeight', String(this.maxHeight));
}
// Move the children to the current element to be able to calculate the height.
this.domUtils.moveChildren(div, this.element);