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

feat(apps): work on plugin directives loading

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-01-13 22:31:29 +01:00
parent 08caf4bbde
commit b55f8215ec
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/core.ts
View File

@@ -25,5 +25,6 @@ import 'app/core/controllers/all';
import 'app/core/services/all'; import 'app/core/services/all';
import 'app/core/routes/all'; import 'app/core/routes/all';
import './filters/filters'; import './filters/filters';
import coreModule from './core_module';
export {arrayJoin}; export {arrayJoin, coreModule};

18
public/app/core/services/dynamic_directive_srv.ts
View File

@@ -9,25 +9,31 @@ class DynamicDirectiveSrv {
constructor(private $compile, private $parse) {} constructor(private $compile, private $parse) {}
addDirective(element, name, scope) { addDirective(element, name, scope) {
var child = angular.element(document.createElement(name));
this.$compile(child)(scope);
element.empty(); element.empty();
element.append(angular.element(document.createElement(name))); element.append(child);
this.$compile(element)(scope);
} }
create(options) { create(options) {
let directiveDef = { let directiveDef = {
restrict: 'E', restrict: 'E',
scope: options.scope, scope: options.scope,
link: function(scope, elem) { link: (scope, elem, attrs) => {
options.directive(scope).then(directiveInfo => { options.directive(scope).then(directiveInfo => {
if (!directiveInfo) { if (!directiveInfo) {
return; return;
} }
if (directiveInfo.fn.hasBeenRegistered) { if (!directiveInfo.fn.registered) {
coreModule.directive(directiveInfo.name, directiveInfo.fn); coreModule.directive(attrs.$normalize(directiveInfo.name), directiveInfo.fn);
directiveInfo.fn.hasBeenRegistered = true; directiveInfo.fn.registered = true;
} }
this.addDirective(elem, directiveInfo.name, scope);
}).catch(function(err) {
console.log('Dynamic directive load error: ', err);
}); });
} }
}; };

4
public/app/features/apps/config_loader.ts
View File

@@ -11,8 +11,8 @@ function appConfigLoader(dynamicDirectiveSrv) {
directive: scope => { directive: scope => {
return System.import(scope.appModel.module).then(function(appModule) { return System.import(scope.appModel.module).then(function(appModule) {
return { return {
name: 'appConfigLoader' + scope.appModel.appId, name: 'app-config-' + scope.appModel.appId,
fn: scope.appModel.directives.configView, fn: appModule.configView,
}; };
}); });
}, },

2
public/app/features/apps/partials/edit.html
View File

@@ -96,8 +96,6 @@
</div> </div>
</section> </section>
<nginx-config></nginx-config>
<div ng-if="ctrl.appModel.appId"> <div ng-if="ctrl.appModel.appId">
<app-config-loader app-model="ctrl.appModel"></app-config-loader> <app-config-loader app-model="ctrl.appModel"></app-config-loader>
</div> </div>

5
public/app/grafana.ts
View File

@@ -8,12 +8,12 @@ import 'angular-sanitize';
import 'angular-dragdrop'; import 'angular-dragdrop';
import 'angular-bindonce'; import 'angular-bindonce';
import 'angular-ui'; import 'angular-ui';
import 'app/core/core';
import $ from 'jquery'; import $ from 'jquery';
import angular from 'angular'; import angular from 'angular';
import config from 'app/core/config'; import config from 'app/core/config';
import _ from 'lodash'; import _ from 'lodash';
import {coreModule} from './core/core';
export class GrafanaApp { export class GrafanaApp {
registerFunctions: any; registerFunctions: any;
@@ -67,6 +67,9 @@ export class GrafanaApp {
this.useModule(angular.module(moduleName, [])); this.useModule(angular.module(moduleName, []));
}); });
// makes it possible to add dynamic stuff
this.useModule(coreModule);
var preBootRequires = [System.import('app/features/all')]; var preBootRequires = [System.import('app/features/all')];
var pluginModules = config.bootData.pluginModules || []; var pluginModules = config.bootData.pluginModules || [];

8
tasks/options/watch.js
View File

@@ -27,15 +27,17 @@ module.exports = function(config, grunt) {
} }
if (/(\.ts)$/.test(filepath)) { if (/(\.ts)$/.test(filepath)) {
newPath = filepath.replace(/^public/, 'public_gen');
grunt.log.writeln('Copying to ' + newPath);
grunt.file.copy(filepath, newPath);
// copy ts file also used by source maps
//changes changed file source to that of the changed file //changes changed file source to that of the changed file
var option = 'typescript.build.src'; var option = 'typescript.build.src';
var result = filepath; var result = filepath;
grunt.config(option, result); grunt.config(option, result);
grunt.task.run('typescript:build'); grunt.task.run('typescript:build');
grunt.task.run('tslint'); grunt.task.run('tslint');
// copy ts file also used by source maps
newPath = filepath.replace(/^public/, 'public_gen');
grunt.file.copy(filepath, newPath);
} }
}); });