Browse Source

feat(build): fixed build issues

Torkel Ödegaard 10 years ago
parent
commit
f1caae126e
2 changed files with 4 additions and 3 deletions
  1. 1 0
      public/app/panels/table/controller.ts
  2. 3 3
      tasks/options/ngtemplates.js

+ 1 - 0
public/app/panels/table/controller.ts

@@ -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;

+ 3 - 3
tasks/options/ngtemplates.js

@@ -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" +
-            "angular.module('grafana').run(['$templateCache', function($templateCache) { \n" +
+          return "define('app/core/partials', ['app/core/core_module'], function(coreModule) { \n" +
+            "coreModule.run(['$templateCache', function($templateCache) { \n" +
                 script +
                 script +
             '\n}]);' +
             '\n}]);' +
           '\n});';
           '\n});';