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

MOBILE-2378 remotethemes: Get only the 35 styles

main
Dani Palou 2018-03-14 09:44:06 +01:00
parent 237bbadc7c
commit 9b3473cb3c
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/addon/remotethemes/providers/remotethemes.ts
View File

@ -30,6 +30,7 @@ import { Md5 } from 'ts-md5/dist/md5';
@Injectable() @Injectable()
export class AddonRemoteThemesProvider { export class AddonRemoteThemesProvider {
static COMPONENT = 'mmaRemoteStyles'; static COMPONENT = 'mmaRemoteStyles';
protected SEPARATOR_35 = /\/\*\*? *3\.5(\.0)? *styles? *\*\//i; // A comment like "/* 3.5 styles */".
protected logger; protected logger;
protected stylesEls: {[siteId: string]: {element: HTMLStyleElement, hash: string}} = {}; protected stylesEls: {[siteId: string]: {element: HTMLStyleElement, hash: string}} = {};
@ -155,7 +156,7 @@ export class AddonRemoteThemesProvider {
return fileUrl; return fileUrl;
} }
} else { } else {
if (infos.mobilecssurl === '') { if (infos && infos.mobilecssurl === '') {
// CSS URL is empty. Delete downloaded files (if any). // CSS URL is empty. Delete downloaded files (if any).
this.filepoolProvider.removeFilesByComponent(siteId, AddonRemoteThemesProvider.COMPONENT, 1); this.filepoolProvider.removeFilesByComponent(siteId, AddonRemoteThemesProvider.COMPONENT, 1);
} }
@ -170,13 +171,28 @@ export class AddonRemoteThemesProvider {
}).then((response): any => { }).then((response): any => {
const text = response && response.text(); const text = response && response.text();
if (typeof text == 'string') { if (typeof text == 'string') {
return {fileUrl: fileUrl, styles: text}; return {fileUrl: fileUrl, styles: this.get35Styles(text)};
} else { } else {
return Promise.reject(null); return Promise.reject(null);
} }
}); });
} }
/**
* Check if the CSS code has a separator for 3.5 styles. If it does, get only the styles after the separator.
*
* @param {string} cssCode The CSS code to check.
* @return {string} The filtered styles.
*/
protected get35Styles(cssCode: string): string {
const separatorPos = cssCode.search(this.SEPARATOR_35);
if (separatorPos > -1) {
return cssCode.substr(separatorPos).replace(this.SEPARATOR_35, '');
}
return cssCode;
}
/** /**
* Load styles for a certain site. * Load styles for a certain site.
* *
@ -230,8 +246,10 @@ export class AddonRemoteThemesProvider {
} }
return this.http.get(url).toPromise().then((response) => { return this.http.get(url).toPromise().then((response) => {
const text = response && response.text(); let text = response && response.text();
if (typeof text == 'string') { if (typeof text == 'string') {
text = this.get35Styles(text);
const styleEl = document.createElement('style'); const styleEl = document.createElement('style');
styleEl.setAttribute('id', 'mobilecssurl-tmpsite'); styleEl.setAttribute('id', 'mobilecssurl-tmpsite');
styleEl.innerHTML = text; styleEl.innerHTML = text;