CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

MOBILE-3102 core: Support disabling site plugins without exceptions

Browse Source
This commit is contained in:
Dani Palou 2019-07-24 15:50:06 +02:00
parent 916d408f65
commit f94d67ed6a
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/siteplugins/providers/helper.ts
View File

@ -78,6 +78,8 @@ import { CoreSitePluginsBlockHandler } from '@core/siteplugins/classes/handlers/
*/ */
@Injectable() @Injectable()
export class CoreSitePluginsHelperProvider { export class CoreSitePluginsHelperProvider {
protected HANDLER_DISABLED = 'core_site_plugins_helper_handler_disabled';
protected logger; protected logger;
constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider, constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
@ -226,7 +228,9 @@ export class CoreSitePluginsHelperProvider {
} }
// Create a "fake" instance to hold all the libraries. // Create a "fake" instance to hold all the libraries.
const instance = {}; const instance = {
HANDLER_DISABLED: this.HANDLER_DISABLED
};
this.compileProvider.injectLibraries(instance); this.compileProvider.injectLibraries(instance);
// Add some data of the WS call result. // Add some data of the WS call result.
@ -238,6 +242,11 @@ export class CoreSitePluginsHelperProvider {
// Now execute the javascript using this instance. // Now execute the javascript using this instance.
result.jsResult = this.compileProvider.executeJavascript(instance, result.javascript); result.jsResult = this.compileProvider.executeJavascript(instance, result.javascript);
if (result.jsResult == this.HANDLER_DISABLED) {
// The "disabled" field was added in 3.8, this is a workaround for previous versions.
result.disabled = true;
}
return result; return result;
}); });
} }
@ -441,6 +450,13 @@ export class CoreSitePluginsHelperProvider {
})); }));
return Promise.all(promises).then(() => { return Promise.all(promises).then(() => {
if (result && result.disabled) {
// This handler is disabled for the current user, stop.
this.logger.warn('Handler disabled by init function', plugin, handlerSchema);
return;
}
if (cssCode) { if (cssCode) {
// Load the styles. // Load the styles.
this.loadStyles(plugin, handlerName, handlerSchema.styles.url, cssCode, handlerSchema.styles.version, siteId); this.loadStyles(plugin, handlerName, handlerSchema.styles.url, cssCode, handlerSchema.styles.version, siteId);