Просмотр исходного кода

moved annotation editor and service to features folder

Torkel Ödegaard 11 лет назад
Родитель
Сommit
8d7390e765

+ 0 - 1
src/app/controllers/all.js

@@ -10,7 +10,6 @@ define([
   './graphiteImport',
   './playlistCtrl',
   './inspectCtrl',
-  './annotationsEditorCtrl',
   './templateEditorCtrl',
   './sharePanelCtrl',
   './jsonEditorCtrl',

+ 1 - 0
src/app/features/all.js

@@ -1,5 +1,6 @@
 define([
   './panellinkeditor/module',
+  './annotations/annotationsSrv',
   './graphite/datasource',
   './influxdb/datasource',
   './opentsdb/datasource',

+ 2 - 1
src/app/services/annotationsSrv.js → src/app/features/annotations/annotationsSrv.js

@@ -1,7 +1,8 @@
 define([
   'angular',
   'lodash',
-  'moment'
+  'moment',
+  './editorCtrl'
 ], function (angular, _, moment) {
   'use strict';
 

+ 0 - 0
src/app/controllers/annotationsEditorCtrl.js → src/app/features/annotations/editorCtrl.js


+ 0 - 0
src/app/partials/annotations_editor.html → src/app/features/annotations/partials/editor.html


+ 0 - 2
src/app/panels/graph/module.js

@@ -8,8 +8,6 @@ define([
   'components/timeSeries',
   'components/panelmeta',
   'services/panelSrv',
-  'services/annotationsSrv',
-  'services/datasourceSrv',
   './seriesOverridesCtrl',
   './graph',
   './legend',

+ 1 - 1
src/app/partials/submenu.html

@@ -10,7 +10,7 @@
 							</a>
 							<ul class="dropdown-menu">
 								<li><a class="pointer" dash-editor-link="app/partials/templating_editor.html">Templating</a></li>
-								<li><a class="pointer" dash-editor-link="app/partials/annotations_editor.html">Annotations</a></li>
+								<li><a class="pointer" dash-editor-link="app/features/annotations/partials/editor.html">Annotations</a></li>
 							</ul>
 						</div>
 					</li>

+ 0 - 1
src/app/services/all.js

@@ -8,7 +8,6 @@ define([
   './panelSrv',
   './timer',
   './keyboardManager',
-  './annotationsSrv',
   './popoverSrv',
   './playlistSrv',
   './unsavedChangesSrv',