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(build): fixed build issues

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-11-12 14:28:35 +01:00
parent bad6a40a12
commit f1caae126e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/panels/table/controller.ts
View File

@@ -9,6 +9,7 @@ import {TableModel} from './table_model';
export class TablePanelCtrl { export class TablePanelCtrl {
/** @ngInject */
constructor($scope, $rootScope, $q, panelSrv, panelHelper, annotationsSrv) { constructor($scope, $rootScope, $q, panelSrv, panelHelper, annotationsSrv) {
$scope.ctrl = this; $scope.ctrl = this;
$scope.pageIndex = 0; $scope.pageIndex = 0;

6
tasks/options/ngtemplates.js
View File

@@ -3,11 +3,11 @@ module.exports = function(config) {
grafana: { grafana: {
cwd: '<%= genDir %>', cwd: '<%= genDir %>',
src: ['app/**/*.html'], src: ['app/**/*.html'],
dest: '<%= genDir %>/app/components/partials.js', dest: '<%= genDir %>/app/core/partials.js',
options: { options: {
bootstrap: function(module, script) { bootstrap: function(module, script) {
return "define('app/components/partials', ['angular'], function(angular) { \n" + return "define('app/core/partials', ['app/core/core_module'], function(coreModule) { \n" +
"angular.module('grafana').run(['$templateCache', function($templateCache) { \n" + "coreModule.run(['$templateCache', function($templateCache) { \n" +
script + script +
'\n}]);' + '\n}]);' +
'\n});'; '\n});';