From d8f68eb11833c73b9509680de411535c8d2b56cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 30 Oct 2015 16:06:29 +0100 Subject: [PATCH] refactoring: moving and renaming things --- public/app/core/controllers/all.js | 20 +++++++++---------- .../{errorCtrl.js => error_ctrl.js} | 0 .../{grafanaCtrl.js => grafana_ctrl.js} | 0 .../{inspectCtrl.js => inspect_ctrl.js} | 0 .../{invitedCtrl.js => invited_ctrl.js} | 0 ...{jsonEditorCtrl.js => json_editor_ctrl.js} | 0 .../{loginCtrl.js => login_ctrl.js} | 0 ...PasswordCtrl.js => reset_password_ctrl.js} | 0 .../controllers/{search.js => search_ctrl.js} | 0 .../{sidemenuCtrl.js => sidemenu_ctrl.js} | 0 .../{signupCtrl.ts => signup_ctrl.ts} | 0 .../services/{alertSrv.js => alert_srv.js} | 0 public/app/core/services/all.js | 16 +++++++-------- .../{backendSrv.js => backend_srv.js} | 0 .../{contextSrv.js => context_srv.js} | 0 .../{datasourceSrv.js => datasource_srv.js} | 0 ...keyboardManager.js => keyboard_manager.js} | 0 .../{popoverSrv.js => popover_srv.js} | 0 .../{uiSegmentSrv.js => segment_srv.js} | 0 .../core/services/{utilSrv.js => util_srv.js} | 0 .../elasticsearch/specs/query_ctrl_specs.ts | 2 +- .../graphite/specs/query_ctrl_specs.ts | 2 +- .../influxdb/specs/query_ctrl_specs.ts | 2 +- .../influxdb_08/specs/datasource-specs.ts | 4 ++-- 24 files changed, 23 insertions(+), 23 deletions(-) rename public/app/core/controllers/{errorCtrl.js => error_ctrl.js} (100%) rename public/app/core/controllers/{grafanaCtrl.js => grafana_ctrl.js} (100%) rename public/app/core/controllers/{inspectCtrl.js => inspect_ctrl.js} (100%) rename public/app/core/controllers/{invitedCtrl.js => invited_ctrl.js} (100%) rename public/app/core/controllers/{jsonEditorCtrl.js => json_editor_ctrl.js} (100%) rename public/app/core/controllers/{loginCtrl.js => login_ctrl.js} (100%) rename public/app/core/controllers/{resetPasswordCtrl.js => reset_password_ctrl.js} (100%) rename public/app/core/controllers/{search.js => search_ctrl.js} (100%) rename public/app/core/controllers/{sidemenuCtrl.js => sidemenu_ctrl.js} (100%) rename public/app/core/controllers/{signupCtrl.ts => signup_ctrl.ts} (100%) rename public/app/core/services/{alertSrv.js => alert_srv.js} (100%) rename public/app/core/services/{backendSrv.js => backend_srv.js} (100%) rename public/app/core/services/{contextSrv.js => context_srv.js} (100%) rename public/app/core/services/{datasourceSrv.js => datasource_srv.js} (100%) rename public/app/core/services/{keyboardManager.js => keyboard_manager.js} (100%) rename public/app/core/services/{popoverSrv.js => popover_srv.js} (100%) rename public/app/core/services/{uiSegmentSrv.js => segment_srv.js} (100%) rename public/app/core/services/{utilSrv.js => util_srv.js} (100%) diff --git a/public/app/core/controllers/all.js b/public/app/core/controllers/all.js index 1a313e6b019..d22010cffdc 100644 --- a/public/app/core/controllers/all.js +++ b/public/app/core/controllers/all.js @@ -1,12 +1,12 @@ define([ - './grafanaCtrl', - './search', - './inspectCtrl', - './jsonEditorCtrl', - './loginCtrl', - './invitedCtrl', - './signupCtrl', - './resetPasswordCtrl', - './sidemenuCtrl', - './errorCtrl', + './grafana_ctrl', + './search_ctrl', + './inspect_ctrl', + './json_editor_ctrl', + './login_ctrl', + './invited_ctrl', + './signup_ctrl', + './reset_password_ctrl', + './sidemenu_ctrl', + './error_ctrl', ], function () {}); diff --git a/public/app/core/controllers/errorCtrl.js b/public/app/core/controllers/error_ctrl.js similarity index 100% rename from public/app/core/controllers/errorCtrl.js rename to public/app/core/controllers/error_ctrl.js diff --git a/public/app/core/controllers/grafanaCtrl.js b/public/app/core/controllers/grafana_ctrl.js similarity index 100% rename from public/app/core/controllers/grafanaCtrl.js rename to public/app/core/controllers/grafana_ctrl.js diff --git a/public/app/core/controllers/inspectCtrl.js b/public/app/core/controllers/inspect_ctrl.js similarity index 100% rename from public/app/core/controllers/inspectCtrl.js rename to public/app/core/controllers/inspect_ctrl.js diff --git a/public/app/core/controllers/invitedCtrl.js b/public/app/core/controllers/invited_ctrl.js similarity index 100% rename from public/app/core/controllers/invitedCtrl.js rename to public/app/core/controllers/invited_ctrl.js diff --git a/public/app/core/controllers/jsonEditorCtrl.js b/public/app/core/controllers/json_editor_ctrl.js similarity index 100% rename from public/app/core/controllers/jsonEditorCtrl.js rename to public/app/core/controllers/json_editor_ctrl.js diff --git a/public/app/core/controllers/loginCtrl.js b/public/app/core/controllers/login_ctrl.js similarity index 100% rename from public/app/core/controllers/loginCtrl.js rename to public/app/core/controllers/login_ctrl.js diff --git a/public/app/core/controllers/resetPasswordCtrl.js b/public/app/core/controllers/reset_password_ctrl.js similarity index 100% rename from public/app/core/controllers/resetPasswordCtrl.js rename to public/app/core/controllers/reset_password_ctrl.js diff --git a/public/app/core/controllers/search.js b/public/app/core/controllers/search_ctrl.js similarity index 100% rename from public/app/core/controllers/search.js rename to public/app/core/controllers/search_ctrl.js diff --git a/public/app/core/controllers/sidemenuCtrl.js b/public/app/core/controllers/sidemenu_ctrl.js similarity index 100% rename from public/app/core/controllers/sidemenuCtrl.js rename to public/app/core/controllers/sidemenu_ctrl.js diff --git a/public/app/core/controllers/signupCtrl.ts b/public/app/core/controllers/signup_ctrl.ts similarity index 100% rename from public/app/core/controllers/signupCtrl.ts rename to public/app/core/controllers/signup_ctrl.ts diff --git a/public/app/core/services/alertSrv.js b/public/app/core/services/alert_srv.js similarity index 100% rename from public/app/core/services/alertSrv.js rename to public/app/core/services/alert_srv.js diff --git a/public/app/core/services/all.js b/public/app/core/services/all.js index bbe0e5235d3..2d4415a8fa2 100644 --- a/public/app/core/services/all.js +++ b/public/app/core/services/all.js @@ -1,13 +1,13 @@ define([ - './alertSrv', - './utilSrv', - './datasourceSrv', - './contextSrv', + './alert_srv', + './util_srv', + './datasource_srv', + './context_srv', './timer', - './keyboardManager', + './keyboard_manager', './analytics', - './popoverSrv', - './uiSegmentSrv', - './backendSrv', + './popover_srv', + './segment_srv', + './backend_srv', ], function () {}); diff --git a/public/app/core/services/backendSrv.js b/public/app/core/services/backend_srv.js similarity index 100% rename from public/app/core/services/backendSrv.js rename to public/app/core/services/backend_srv.js diff --git a/public/app/core/services/contextSrv.js b/public/app/core/services/context_srv.js similarity index 100% rename from public/app/core/services/contextSrv.js rename to public/app/core/services/context_srv.js diff --git a/public/app/core/services/datasourceSrv.js b/public/app/core/services/datasource_srv.js similarity index 100% rename from public/app/core/services/datasourceSrv.js rename to public/app/core/services/datasource_srv.js diff --git a/public/app/core/services/keyboardManager.js b/public/app/core/services/keyboard_manager.js similarity index 100% rename from public/app/core/services/keyboardManager.js rename to public/app/core/services/keyboard_manager.js diff --git a/public/app/core/services/popoverSrv.js b/public/app/core/services/popover_srv.js similarity index 100% rename from public/app/core/services/popoverSrv.js rename to public/app/core/services/popover_srv.js diff --git a/public/app/core/services/uiSegmentSrv.js b/public/app/core/services/segment_srv.js similarity index 100% rename from public/app/core/services/uiSegmentSrv.js rename to public/app/core/services/segment_srv.js diff --git a/public/app/core/services/utilSrv.js b/public/app/core/services/util_srv.js similarity index 100% rename from public/app/core/services/utilSrv.js rename to public/app/core/services/util_srv.js diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts index bcf111827a6..776b9064a95 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts @@ -1,5 +1,5 @@ /// -/// +/// /// import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common'; diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts index 03602973f25..364a64f82aa 100644 --- a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts +++ b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts @@ -1,6 +1,6 @@ /// /// -/// +/// /// import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common'; diff --git a/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts index 6da2c78535d..8fb5bea4925 100644 --- a/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts +++ b/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts @@ -1,5 +1,5 @@ /// -/// +/// /// import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common'; diff --git a/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts b/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts index 4d3d2b3817f..a8111776465 100644 --- a/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts +++ b/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts @@ -1,6 +1,6 @@ /// -/// -/// +/// +/// /// import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';