Merge branch 'master' of http://github.com/wbuchwalter/ng-redux

Author: wbuchwalter

.editorconfig

@@ -0,0 +1,21 @@
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+insert_final_newline = true
+indent_style = space
+max_line_length = 0
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+# The indent size used in the `package.json` file cannot be changed
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
+# The other files are added for parity.
+[{.bowerrc,.travis.yml,bower.json,package.json}]
+indent_size = 2
+indent_style = space

.npmignore

@@ -4,4 +4,4 @@ examples
 .DS_Store
 *.log
 *.tgs
-*.yml
+*.yml

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "iojs"
+  - "iojs"

examples/counter/actions/counter.js

@@ -31,4 +31,4 @@ export function incrementAsync(delay = 1000) {
       dispatch(increment());
     }, delay);
   };
-}
+}

examples/counter/components/counter.html

@@ -1,6 +1,5 @@
 <div>
     <p>Clicked: {{counter.value}} times </p>
-
     <button ng-click='counter.increment()'>+</button>
     <button ng-click='counter.decrement()'>-</button>
     <button ng-click='counter.incrementIfOdd()'>Increment if odd</button>

examples/counter/components/counter.js

@@ -23,4 +23,4 @@ class CounterController {
       value: state.counter
     };
   }
-}
+}

examples/counter/index.html

@@ -10,4 +10,4 @@
     </div>
     <div id="devTools"></div>
   </body>
-</html>
+</html>

examples/counter/reducers/counter.js

@@ -9,4 +9,4 @@ export default function counter(state = 0, action) {
   default:
     return state;
   }
-}
+}

examples/counter/reducers/index.js

@@ -5,4 +5,4 @@ const rootReducer = combineReducers({
   counter
 });
 
-export default rootReducer;
+export default rootReducer;

index.d.ts

@@ -32,4 +32,4 @@ export interface INgReduxProvider {
 }
 
 export var ngRedux: string;
-export default ngRedux;
+export default ngRedux;