IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into react-panels

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-09-10 15:42:36 +02:00
parent 864c4691da 35a24032a7
commit 100ab0ba23
597 changed files with 13109 additions and 9258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/plugins/plugin_loader.ts
View File

@@ -66,7 +66,7 @@ System.config({
});
function exposeToPlugin(name: string, component: any) {
System.registerDynamic(name, [], true, function(require, exports, module) {
System.registerDynamic(name, [], true, (require, exports, module) => {
module.exports = component;
});
}
@@ -142,12 +142,12 @@ const flotDeps = [
'jquery.flot.gauge',
];
for (let flotDep of flotDeps) {
for (const flotDep of flotDeps) {
exposeToPlugin(flotDep, { fakeDep: 1 });
}
export function importPluginModule(path: string): Promise<PluginExports> {
let builtIn = builtInPlugins[path];
const builtIn = builtInPlugins[path];
if (builtIn) {
return Promise.resolve(builtIn);
}