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

Merge pull request #1328 from dpalou/MOBILE-2376 

MOBILE-2376 siteplugins: Parse otherdata and always inject libraries
main
Juan Leyva 2018-06-04 10:44:41 +02:00 committed by GitHub
parent 7ef4726bf5 129a6327e6
commit 0ec3f9fcab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/compile/components/compile-html/compile-html.ts
View File

@ -119,10 +119,12 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
// Store this instance so it can be accessed by the outer component.
compileInstance.componentInstance = this;
// If there is some javascript to run, prepare the instance.
if (compileInstance.javascript) {
// Create 2 empty properties that can be used by the template to store data.
this['dataObject'] = {};
this['dataArray'] = [];
// Inject the libraries.
compileInstance.compileProvider.injectLibraries(this, compileInstance.extraProviders);
}
// Always add these elements, they could be needed on component init (componentObservable).
this['ChangeDetectorRef'] = compileInstance.cdr;

13
src/core/siteplugins/providers/siteplugins.ts
View File

@ -20,6 +20,7 @@ import { CoreLangProvider } from '@providers/lang';
import { CoreLoggerProvider } from '@providers/logger';
import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
import { CoreSitesProvider } from '@providers/sites';
import { CoreTextUtilsProvider } from '@providers/utils/text';
import { CoreUtilsProvider } from '@providers/utils/utils';
import { CoreConfigConstants } from '../../../configconstants';
import { CoreCoursesProvider } from '@core/courses/providers/courses';
@ -68,7 +69,8 @@ export class CoreSitePluginsProvider {
constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider,
private langProvider: CoreLangProvider, private appProvider: CoreAppProvider, private platform: Platform,
private filepoolProvider: CoreFilepoolProvider, private coursesProvider: CoreCoursesProvider) {
private filepoolProvider: CoreFilepoolProvider, private coursesProvider: CoreCoursesProvider,
private textUtils: CoreTextUtilsProvider) {
this.logger = logger.getInstance('CoreUserProvider');
}
@ -218,6 +220,15 @@ export class CoreSitePluginsProvider {
}).then((result) => {
if (result.otherdata) {
result.otherdata = this.utils.objectToKeyValueMap(result.otherdata, 'name', 'value');
// Try to parse all properties that could be JSON encoded strings.
for (const name in result.otherdata) {
const value = result.otherdata[name];
if (typeof value == 'string' && (value[0] == '{' || value[0] == '[')) {
result.otherdata[name] = this.textUtils.parseJSON(value);
}
}
} else {
result.otherdata = {};
}