Skip to content

Commit 2b388cd

Browse files
Just Use Prettier™
1 parent 04ce12a commit 2b388cd

17 files changed

+4020
-4741
lines changed

src/directives/stateDirectives.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ function clickHook(
100100
if (!(button > 1 || e.ctrlKey || e.metaKey || e.shiftKey || el.attr('target'))) {
101101
// HACK: This is to allow ng-clicks to be processed before the transition is initiated:
102102
const transition = $timeout(function() {
103-
if (!el.attr('disabled')) {
104-
$state.go(target.uiState, target.uiStateParams, target.uiStateOpts);
105-
}
103+
if (!el.attr('disabled')) {
104+
$state.go(target.uiState, target.uiStateParams, target.uiStateOpts);
105+
}
106106
});
107107
e.preventDefault();
108108

src/directives/viewDirective.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,8 @@ function $ViewDirectiveFill(
410410
scope[resolveAs] = locals;
411411

412412
if (controller) {
413-
const controllerInstance = <Ng1Controller>$controller(
414-
controller,
415-
extend({}, locals, { $scope: scope, $element: $element })
413+
const controllerInstance = <Ng1Controller>(
414+
$controller(controller, extend({}, locals, { $scope: scope, $element: $element }))
416415
);
417416
if (controllerAs) {
418417
scope[controllerAs] = controllerInstance;

src/services.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ import { Ng1LocationServices } from './locationServices';
4141
import { UrlRouterProvider } from './urlRouterProvider';
4242
import IInjectorService = angular.auto.IInjectorService; // tslint:disable-line
4343

44-
angular.module("ui.router.angular1", []);
45-
const mod_init = angular.module('ui.router.init', ['ng']);
46-
const mod_util = angular.module('ui.router.util', ['ui.router.init']);
47-
const mod_rtr = angular.module('ui.router.router', ['ui.router.util']);
48-
const mod_state = angular.module('ui.router.state', ['ui.router.router', 'ui.router.util', 'ui.router.angular1']);
49-
const mod_main = angular.module('ui.router', ['ui.router.init', 'ui.router.state', 'ui.router.angular1']);
50-
const mod_cmpt = angular.module('ui.router.compat', ['ui.router']); // tslint:disable-line
44+
angular.module('ui.router.angular1', []);
45+
const mod_init = angular.module('ui.router.init', ['ng']);
46+
const mod_util = angular.module('ui.router.util', ['ui.router.init']);
47+
const mod_rtr = angular.module('ui.router.router', ['ui.router.util']);
48+
const mod_state = angular.module('ui.router.state', ['ui.router.router', 'ui.router.util', 'ui.router.angular1']);
49+
const mod_main = angular.module('ui.router', ['ui.router.init', 'ui.router.state', 'ui.router.angular1']);
50+
const mod_cmpt = angular.module('ui.router.compat', ['ui.router']); // tslint:disable-line
5151

5252
declare module '@uirouter/core/lib/router' {
5353
interface UIRouter {

test/ng1StateBuilderSpec.ts

+21-25
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,26 @@ describe('Ng1 StateBuilder', function() {
3636
expect(builtViews.a.controller).toEqualData(config.a.controller);
3737
});
3838

39-
it(
40-
'should not allow a view config with both component and template keys',
41-
inject(function($injector) {
42-
const config = {
43-
name: 'foo',
44-
url: '/foo',
45-
template: '<h1>hey</h1>',
46-
controller: 'FooController',
47-
parent: parent,
48-
};
49-
expect(() => builder.builder('views')(config)).not.toThrow();
50-
expect(() => builder.builder('views')(extend({ component: 'fooComponent' }, config))).toThrow();
51-
expect(() => builder.builder('views')(extend({ componentProvider: () => 'fooComponent' }, config))).toThrow();
52-
expect(() => builder.builder('views')(extend({ bindings: {} }, config))).toThrow();
53-
})
54-
);
39+
it('should not allow a view config with both component and template keys', inject(function($injector) {
40+
const config = {
41+
name: 'foo',
42+
url: '/foo',
43+
template: '<h1>hey</h1>',
44+
controller: 'FooController',
45+
parent: parent,
46+
};
47+
expect(() => builder.builder('views')(config)).not.toThrow();
48+
expect(() => builder.builder('views')(extend({ component: 'fooComponent' }, config))).toThrow();
49+
expect(() => builder.builder('views')(extend({ componentProvider: () => 'fooComponent' }, config))).toThrow();
50+
expect(() => builder.builder('views')(extend({ bindings: {} }, config))).toThrow();
51+
}));
5552

56-
it(
57-
'should replace a resolve: string value with a function that injects the service of the same name',
58-
inject(function($injector) {
59-
const config = { resolve: { foo: 'bar' } };
60-
expect(builder.builder('resolvables')).toBeDefined();
61-
const built: Resolvable[] = builder.builder('resolvables')(config);
62-
expect(built[0].deps).toEqual(['bar']);
63-
})
64-
);
53+
it('should replace a resolve: string value with a function that injects the service of the same name', inject(function(
54+
$injector
55+
) {
56+
const config = { resolve: { foo: 'bar' } };
57+
expect(builder.builder('resolvables')).toBeDefined();
58+
const built: Resolvable[] = builder.builder('resolvables')(config);
59+
expect(built[0].deps).toEqual(['bar']);
60+
}));
6561
});

0 commit comments

Comments
 (0)