Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Map some extra angular deps #6173

Merged
merged 2 commits into from
Feb 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/ui/public/config/_delayed_updater.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import _ from 'lodash';
import angular from 'angular';
import ConfigValsProvider from 'ui/config/_vals';
export default function DelayedUpdaterFactory(Private, $rootScope, Promise, Notifier) {
import Notifier from 'ui/notify/notifier';

export default function DelayedUpdaterFactory(Private, $rootScope, Promise) {
var notify = new Notifier();

var vals = Private(ConfigValsProvider);
Expand Down
8 changes: 4 additions & 4 deletions src/ui/public/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import ConfigValsProvider from 'ui/config/_vals';
import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
var module = uiModules.get('kibana/config', [
'kibana/notify'
]);
import Notifier from 'ui/notify/notifier';

var module = uiModules.get('kibana/config');

uiRoutes.addSetupWork(function (config) {
return config.init();
});

// service for delivering config variables to everywhere else
module.service('config', function (Private, Notifier, kbnVersion, kbnIndex, $rootScope, buildNum) {
module.service('config', function (Private, kbnVersion, kbnIndex, $rootScope, buildNum) {
var config = this;

var defaults = Private(ConfigDefaultsProvider);
Expand Down
2 changes: 2 additions & 0 deletions src/ui/public/courier/data_source/doc_source.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import CourierDataSourceDocSendToEsProvider from 'ui/courier/data_source/_doc_se
import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract';
import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc';
import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc';
import 'ui/es';
import 'ui/storage';

export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
var sendToEs = Private(CourierDataSourceDocSendToEsProvider);
Expand Down
4 changes: 3 additions & 1 deletion src/ui/public/courier/fetch/_notifier.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export default function CourierFetchNotifier(Notifier) {
import Notifier from 'ui/notify/notifier';

export default function CourierFetchNotifier() {
return new Notifier({
location: 'Courier Fetch'
});
Expand Down
3 changes: 2 additions & 1 deletion src/ui/public/courier/fetch/request/_error_handler.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import CourierErrorHandlersProvider from 'ui/courier/_error_handlers';
import Notifier from 'ui/notify/notifier';

export default function RequestErrorHandlerFactory(Private, Notifier) {
export default function RequestErrorHandlerFactory(Private) {
var errHandlers = Private(CourierErrorHandlersProvider);

var notify = new Notifier({
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/state_management/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import rison from 'ui/utils/rison';
import applyDiff from 'ui/utils/diff_object';
import qs from 'ui/utils/query_string';
import EventsProvider from 'ui/events';
import Notifier from 'ui/notify/notifier';


export default function StateProvider(Notifier, Private, $rootScope, $location) {
export default function StateProvider(Private, $rootScope, $location) {
var Events = Private(EventsProvider);

_.class(State).inherits(Events);
Expand Down Expand Up @@ -147,4 +148,3 @@ export default function StateProvider(Notifier, Private, $rootScope, $location)
return State;

};

3 changes: 2 additions & 1 deletion src/ui/public/timefilter/timefilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import angular from 'angular';
import moment from 'moment';
import dateMath from 'ui/utils/dateMath';
import 'ui/state_management/global_state';
import 'ui/config';
import EventsProvider from 'ui/events';
import UtilsDiffTimePickerValsProvider from 'ui/utils/diff_time_picker_vals';
import TimefilterLibDiffTimeProvider from 'ui/timefilter/lib/diff_time';
import TimefilterLibDiffIntervalProvider from 'ui/timefilter/lib/diff_interval';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';

uiRoutes
.addSetupWork(function (timefilter) {
return timefilter.init();
Expand Down Expand Up @@ -111,4 +113,3 @@ uiModules

return new Timefilter();
});