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

Merge pull request #1757 from dpalou/MOBILE-2799 

Mobile 2799
main
Juan Leyva 2019-02-08 13:53:07 +01:00 committed by GitHub
parent e21d9f3cd2 552b2d5a4a
commit ffd97fc9b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/user/pages/profile/profile.ts
View File

@ -97,6 +97,14 @@ export class CoreUserProfilePage {
fetchUser(): Promise<any> {
return this.userProvider.getProfile(this.userId, this.courseId).then((user) => {
if (this.userId == this.site.getUserId() && user.profileimageurl != this.site.getInfo().userpictureurl) {
// The current user image received is different than the one stored in site info. Assume the image was updated.
this.eventsProvider.trigger(CoreUserProvider.PROFILE_PICTURE_UPDATED, {
userId: this.userId,
picture: user.profileimageurl
}, this.site.getId());
}
user.address = this.userHelper.formatAddress('', user.city, user.country);
user.roles = this.userHelper.formatRoleList(user.roles);

102
src/directives/external-content.ts
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { Directive, Input, AfterViewInit, ElementRef } from '@angular/core';
import { Directive, Input, AfterViewInit, ElementRef, OnChanges, SimpleChange } from '@angular/core';
import { Platform } from 'ionic-angular';
import { CoreAppProvider } from '@providers/app';
import { CoreLoggerProvider } from '@providers/logger';
@ -35,13 +35,18 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
@Directive({
selector: '[core-external-content]'
})
export class CoreExternalContentDirective implements AfterViewInit {
export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
@Input() siteId?: string; // Site ID to use.
@Input() component?: string; // Component to link the file to.
@Input() componentId?: string | number; // Component ID to use in conjunction with the component.
@Input() src?: string;
@Input() href?: string;
@Input('target-src') targetSrc?: string;
@Input() poster?: string;
protected element: HTMLElement;
protected logger;
protected initialized = false;
constructor(element: ElementRef, logger: CoreLoggerProvider, private filepoolProvider: CoreFilepoolProvider,
private platform: Platform, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
@ -55,47 +60,21 @@ export class CoreExternalContentDirective implements AfterViewInit {
* View has been initialized
*/
ngAfterViewInit(): void {
const currentSite = this.sitesProvider.getCurrentSite(),
siteId = this.siteId || (currentSite && currentSite.getId()),
tagName = this.element.tagName;
let targetAttr,
sourceAttr;
this.checkAndHandleExternalContent();
// Always handle inline styles (if any).
this.handleInlineStyles(siteId).catch((error) => {
this.logger.error('Error treating inline styles.', this.element);
});
if (tagName === 'A') {
targetAttr = 'href';
sourceAttr = 'href';
} else if (tagName === 'IMG') {
targetAttr = 'src';
sourceAttr = 'src';
} else if (tagName === 'AUDIO' || tagName === 'VIDEO' || tagName === 'SOURCE' || tagName === 'TRACK') {
targetAttr = 'src';
sourceAttr = 'target-src';
if (tagName === 'VIDEO') {
const poster = (<HTMLVideoElement> this.element).poster;
if (poster) {
// Handle poster.
this.handleExternalContent('poster', poster, siteId).catch(() => {
// Ignore errors.
});
}
this.initialized = true;
}
} else {
return;
/**
* Listen to changes.
*
* * @param {{[name: string]: SimpleChange}} changes Changes.
*/
ngOnChanges(changes: { [name: string]: SimpleChange }): void {
if (changes && this.initialized) {
// If any of the inputs changes, handle the content again.
this.checkAndHandleExternalContent();
}
const url = this.element.getAttribute(sourceAttr) || this.element.getAttribute(targetAttr);
this.handleExternalContent(targetAttr, url, siteId).catch(() => {
// Ignore errors.
});
}
/**
@ -124,6 +103,51 @@ export class CoreExternalContentDirective implements AfterViewInit {
this.element.parentNode.insertBefore(newSource, this.element);
}
/**
* Get the URL that should be handled and, if valid, handle it.
*/
protected checkAndHandleExternalContent(): void {
const currentSite = this.sitesProvider.getCurrentSite(),
siteId = this.siteId || (currentSite && currentSite.getId()),
tagName = this.element.tagName;
let targetAttr,
url;
// Always handle inline styles (if any).
this.handleInlineStyles(siteId).catch((error) => {
this.logger.error('Error treating inline styles.', this.element);
});
if (tagName === 'A') {
targetAttr = 'href';
url = this.href;
} else if (tagName === 'IMG') {
targetAttr = 'src';
url = this.src;
} else if (tagName === 'AUDIO' || tagName === 'VIDEO' || tagName === 'SOURCE' || tagName === 'TRACK') {
targetAttr = 'src';
url = this.targetSrc || this.src;
if (tagName === 'VIDEO') {
if (this.poster) {
// Handle poster.
this.handleExternalContent('poster', this.poster, siteId).catch(() => {
// Ignore errors.
});
}
}
} else {
return;
}
this.handleExternalContent(targetAttr, url, siteId).catch(() => {
// Ignore errors.
});
}
/**
* Handle external content, setting the right URL.
*