Skip to content

Commit 2e11e8c

Browse files
author
James Whitney
committedDec 17, 2015
Add .editorconfig
1 parent a6a6faa commit 2e11e8c

File tree

15 files changed

+65
-47
lines changed

15 files changed

+65
-47
lines changed
 

‎.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"stage": 0,
33
"loose": "all"
4-
}
4+
}

‎.editorconfig

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
end_of_line = lf
7+
indent_size = 2
8+
insert_final_newline = true
9+
indent_style = space
10+
max_line_length = 0
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
trim_trailing_whitespace = false
15+
16+
# The indent size used in the `package.json` file cannot be changed
17+
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
18+
# The other files are added for parity.
19+
[{.bowerrc,.travis.yml,bower.json,package.json}]
20+
indent_size = 2
21+
indent_style = space

‎.npmignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ examples
44
.DS_Store
55
*.log
66
*.tgs
7-
*.yml
7+
*.yml

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
language: node_js
22
node_js:
3-
- "iojs"
3+
- "iojs"

‎examples/counter/actions/counter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ export function incrementAsync(delay = 1000) {
3131
dispatch(increment());
3232
}, delay);
3333
};
34-
}
34+
}

‎examples/counter/components/counter.html

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<div>
22
<p>Clicked: {{counter.value}} times </p>
3-
43
<button ng-click='counter.increment()'>+</button>
54
<button ng-click='counter.decrement()'>-</button>
65
<button ng-click='counter.incrementIfOdd()'>Increment if odd</button>

‎examples/counter/components/counter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ class CounterController {
2323
value: state.counter
2424
};
2525
}
26-
}
26+
}

‎examples/counter/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
</div>
1111
<div id="devTools"></div>
1212
</body>
13-
</html>
13+
</html>

‎examples/counter/reducers/counter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ export default function counter(state = 0, action) {
99
default:
1010
return state;
1111
}
12-
}
12+
}

‎examples/counter/reducers/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ const rootReducer = combineReducers({
55
counter
66
});
77

8-
export default rootReducer;
8+
export default rootReducer;

‎index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ export interface INgReduxProvider {
3232
}
3333

3434
export var ngRedux: string;
35-
export default ngRedux;
35+
export default ngRedux;

‎src/components/connector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ function getStateSlice(state, mapStateToScope) {
7474
);
7575

7676
return slice;
77-
}
77+
}

‎src/components/ngRedux.js

+25-25
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@ export default function ngReduxProvider() {
1212
let _storeEnhancers = undefined;
1313

1414
this.createStoreWith = (reducer, middlewares, storeEnhancers) => {
15-
invariant(
16-
isFunction(reducer),
17-
'The reducer parameter passed to createStoreWith must be a Function. Instead received %s.',
18-
typeof reducer
19-
);
20-
21-
invariant(
22-
!storeEnhancers || isArray(storeEnhancers),
23-
'The storeEnhancers parameter passed to createStoreWith must be an Array. Instead received %s.',
24-
typeof storeEnhancers
25-
);
26-
27-
_reducer = reducer;
28-
_storeEnhancers = storeEnhancers
29-
_middlewares = middlewares || [];
15+
invariant(
16+
isFunction(reducer),
17+
'The reducer parameter passed to createStoreWith must be a Function. Instead received %s.',
18+
typeof reducer
19+
);
20+
21+
invariant(
22+
!storeEnhancers || isArray(storeEnhancers),
23+
'The storeEnhancers parameter passed to createStoreWith must be an Array. Instead received %s.',
24+
typeof storeEnhancers
25+
);
26+
27+
_reducer = reducer;
28+
_storeEnhancers = storeEnhancers
29+
_middlewares = middlewares || [];
3030
};
3131

3232
this.$get = ($injector) => {
33-
let store, resolvedMiddleware = [];
33+
let store, resolvedMiddleware = [];
3434

35-
for(let middleware of _middlewares) {
36-
if(typeof middleware === 'string') {
37-
resolvedMiddleware.push($injector.get(middleware));
38-
} else {
39-
resolvedMiddleware.push(middleware);
40-
}
41-
}
35+
for(let middleware of _middlewares) {
36+
if(typeof middleware === 'string') {
37+
resolvedMiddleware.push($injector.get(middleware));
38+
} else {
39+
resolvedMiddleware.push(middleware);
40+
}
41+
}
4242

4343
let finalCreateStore = _storeEnhancers ? compose(..._storeEnhancers)(createStore) : createStore;
4444

@@ -47,11 +47,11 @@ export default function ngReduxProvider() {
4747

4848
store = applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer);
4949

50-
return {
50+
return {
5151
...store,
5252
connect: Connector(store)
5353
};
54-
}
54+
};
5555

5656
this.$get.$inject = ['$injector'];
5757
}

‎test/components/connector.spec.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@ describe('Connector', () => {
2222
connect = Connector(store);
2323
});
2424

25-
it('Should throw when target is not a Function or a plain object', () => {
26-
expect(connect(() => ({})).bind(connect, 15)).toThrow();
27-
expect(connect(() => ({})).bind(connect, undefined)).toThrow();
28-
expect(connect(() => ({})).bind(connect, 'test')).toThrow();
29-
30-
expect(connect(() => ({})).bind(connect, {})).toNotThrow();
25+
it('Should throw when target is not a Function or a plain object', () => {
26+
expect(connect(() => ({})).bind(connect, 15)).toThrow();
27+
expect(connect(() => ({})).bind(connect, undefined)).toThrow();
28+
expect(connect(() => ({})).bind(connect, 'test')).toThrow();
29+
expect(connect(() => ({})).bind(connect, {})).toNotThrow();
3130
expect(connect(() => ({})).bind(connect, () => {})).toNotThrow();
32-
33-
});
31+
});
3432

3533
it('Should throw when selector does not return a plain object', () => {
3634
expect(connect.bind(connect, state => state.foo)).toThrow();
@@ -61,7 +59,7 @@ describe('Connector', () => {
6159

6260
targetObj.baz = 0;
6361

64-
//this should not replace our mutation, since the state didn't change
62+
//this should not replace our mutation, since the state didn't change
6563
store.dispatch({ type: 'ACTION', payload: 5 });
6664

6765
expect(targetObj.baz).toBe(0);
@@ -94,4 +92,4 @@ describe('Connector', () => {
9492
expect(receivedDispatch).toBe(store.dispatch);
9593
});
9694

97-
});
95+
});

‎test/utils/wrapActionCreators.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ describe('Utils', () => {
2828

2929
});
3030
});
31-
});
31+
});

0 commit comments

Comments
 (0)