MOBILE-2902 data: Use core-style for the CSS template
This commit is contained in:
parent
5c95446c59
commit
4934624f67
@ -67,9 +67,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<div class="addon-data-contents addon-data-entries-{{data.id}}" *ngIf="!isEmpty">
|
<div class="addon-data-contents addon-data-entries-{{data.id}}" *ngIf="!isEmpty">
|
||||||
<style *ngIf="cssTemplate">
|
<core-style [css]="data.csstemplate" prefix=".addon-data-entries-{{data.id}}"></core-style>
|
||||||
{{ cssTemplate }}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<core-compile-html [text]="entriesRendered" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
|
<core-compile-html [text]="entriesRendered" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
|
||||||
</div>
|
</div>
|
||||||
|
@ -67,7 +67,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
|
|||||||
offlineActions: any;
|
offlineActions: any;
|
||||||
offlineEntries: any;
|
offlineEntries: any;
|
||||||
entriesRendered = '';
|
entriesRendered = '';
|
||||||
cssTemplate = '';
|
|
||||||
extraImports = [AddonModDataComponentsModule];
|
extraImports = [AddonModDataComponentsModule];
|
||||||
jsData;
|
jsData;
|
||||||
foundRecordsData;
|
foundRecordsData;
|
||||||
@ -298,8 +297,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!this.isEmpty) {
|
if (!this.isEmpty) {
|
||||||
this.cssTemplate = this.dataHelper.prefixCSS(this.data.csstemplate, '.addon-data-entries-' + this.data.id);
|
|
||||||
|
|
||||||
const siteInfo = this.sitesProvider.getCurrentSite().getInfo(),
|
const siteInfo = this.sitesProvider.getCurrentSite().getInfo(),
|
||||||
promises = [];
|
promises = [];
|
||||||
|
|
||||||
|
@ -18,10 +18,8 @@
|
|||||||
</ion-select>
|
</ion-select>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
<div class="addon-data-contents {{cssClass}}">
|
<div class="addon-data-contents addon-data-entries-{{data.id}}" *ngIf="data">
|
||||||
<style *ngIf="cssTemplate">
|
<core-style [css]="data.csstemplate" prefix=".addon-data-entries-{{data.id}}"></core-style>
|
||||||
{{ cssTemplate }}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<form (ngSubmit)="save($event)" [formGroup]="editForm">
|
<form (ngSubmit)="save($event)" [formGroup]="editForm">
|
||||||
<core-compile-html [text]="editFormRender" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
|
<core-compile-html [text]="editFormRender" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
|
||||||
|
@ -57,7 +57,6 @@ export class AddonModDataEditPage {
|
|||||||
loaded = false;
|
loaded = false;
|
||||||
selectedGroup = 0;
|
selectedGroup = 0;
|
||||||
cssClass = '';
|
cssClass = '';
|
||||||
cssTemplate = '';
|
|
||||||
groupInfo: any;
|
groupInfo: any;
|
||||||
editFormRender = '';
|
editFormRender = '';
|
||||||
editForm: FormGroup;
|
editForm: FormGroup;
|
||||||
@ -132,8 +131,6 @@ export class AddonModDataEditPage {
|
|||||||
|
|
||||||
return this.dataProvider.getDatabaseAccessInformation(data.id);
|
return this.dataProvider.getDatabaseAccessInformation(data.id);
|
||||||
}).then((accessData) => {
|
}).then((accessData) => {
|
||||||
this.cssTemplate = this.dataHelper.prefixCSS(this.data.csstemplate, '.' + this.cssClass);
|
|
||||||
|
|
||||||
if (this.entryId) {
|
if (this.entryId) {
|
||||||
return this.groupsProvider.getActivityGroupInfo(this.data.coursemodule, accessData.canmanageentries)
|
return this.groupsProvider.getActivityGroupInfo(this.data.coursemodule, accessData.canmanageentries)
|
||||||
.then((groupInfo) => {
|
.then((groupInfo) => {
|
||||||
|
@ -22,10 +22,8 @@
|
|||||||
</ion-select>
|
</ion-select>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
<div class="addon-data-contents {{cssClass}}" *ngIf="entry">
|
<div class="addon-data-contents addon-data-entries-{{data.id}}" *ngIf="entry">
|
||||||
<style *ngIf="cssTemplate">
|
<core-style [css]="data.csstemplate" prefix=".addon-data-entries-{{data.id}}"></core-style>
|
||||||
{{ cssTemplate }}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<core-compile-html [text]="entryRendered" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
|
<core-compile-html [text]="entryRendered" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
|
||||||
</div>
|
</div>
|
||||||
|
@ -55,7 +55,6 @@ export class AddonModDataEntryPage implements OnDestroy {
|
|||||||
entry: any;
|
entry: any;
|
||||||
offlineActions = [];
|
offlineActions = [];
|
||||||
hasOffline = false;
|
hasOffline = false;
|
||||||
cssTemplate = '';
|
|
||||||
previousOffset: number;
|
previousOffset: number;
|
||||||
nextOffset: number;
|
nextOffset: number;
|
||||||
access: any;
|
access: any;
|
||||||
@ -64,7 +63,6 @@ export class AddonModDataEntryPage implements OnDestroy {
|
|||||||
showComments: any;
|
showComments: any;
|
||||||
entryRendered = '';
|
entryRendered = '';
|
||||||
siteId: string;
|
siteId: string;
|
||||||
cssClass = '';
|
|
||||||
extraImports = [AddonModDataComponentsModule];
|
extraImports = [AddonModDataComponentsModule];
|
||||||
jsData;
|
jsData;
|
||||||
ratingInfo: CoreRatingInfo;
|
ratingInfo: CoreRatingInfo;
|
||||||
@ -133,7 +131,6 @@ export class AddonModDataEntryPage implements OnDestroy {
|
|||||||
return this.dataProvider.getDatabase(this.courseId, this.module.id).then((data) => {
|
return this.dataProvider.getDatabase(this.courseId, this.module.id).then((data) => {
|
||||||
this.title = data.name || this.title;
|
this.title = data.name || this.title;
|
||||||
this.data = data;
|
this.data = data;
|
||||||
this.cssClass = 'addon-data-entries-' + data.id;
|
|
||||||
|
|
||||||
return this.setEntryIdFromOffset(data.id, this.offset, this.selectedGroup).then(() => {
|
return this.setEntryIdFromOffset(data.id, this.offset, this.selectedGroup).then(() => {
|
||||||
return this.dataProvider.getDatabaseAccessInformation(data.id);
|
return this.dataProvider.getDatabaseAccessInformation(data.id);
|
||||||
@ -167,8 +164,6 @@ export class AddonModDataEntryPage implements OnDestroy {
|
|||||||
this.ratingInfo = entry.ratinginfo;
|
this.ratingInfo = entry.ratinginfo;
|
||||||
entry = entry.entry;
|
entry = entry.entry;
|
||||||
|
|
||||||
this.cssTemplate = this.dataHelper.prefixCSS(this.data.csstemplate, '.' + this.cssClass);
|
|
||||||
|
|
||||||
// Index contents by fieldid.
|
// Index contents by fieldid.
|
||||||
entry.contents = this.utils.arrayToObject(entry.contents, 'fieldid');
|
entry.contents = this.utils.arrayToObject(entry.contents, 'fieldid');
|
||||||
|
|
||||||
|
@ -423,27 +423,6 @@ export class AddonModDataHelperProvider {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a prefix to all rules in a CSS string.
|
|
||||||
*
|
|
||||||
* @param {string} css CSS code to be prefixed.
|
|
||||||
* @param {string} prefix Prefix css selector.
|
|
||||||
* @return {string} Prefixed CSS.
|
|
||||||
*/
|
|
||||||
prefixCSS(css: string, prefix: string): string {
|
|
||||||
if (!css) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove comments first.
|
|
||||||
let regExp = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
|
|
||||||
css = css.replace(regExp, '');
|
|
||||||
// Add prefix.
|
|
||||||
regExp = /([^]*?)({[^]*?}|,)/g;
|
|
||||||
|
|
||||||
return css.replace(regExp, prefix + ' $1 $2');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Given a list of files (either online files or local files), store the local files in a local folder
|
* Given a list of files (either online files or local files), store the local files in a local folder
|
||||||
* to be submitted later.
|
* to be submitted later.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user