more minor code style updates

- fix some more code style issues that were unnoticed in couple of latest commits

Author: akuzko

CHANGELOG

@@ -1,5 +1,7 @@
 === master
 
+More minor code style updates
+
 Small fix for form in demo app
 
 Small code style updates

src/Form.jsx

@@ -26,7 +26,7 @@ export default class Form extends (PureComponent || Component) {
  state = { errors: {} };
  validations = {};
  validator = buildFormValidator(this);
- cache = buildHandlersCache();
+ _handlersCache = buildHandlersCache();
 
  componentWillReceiveProps() {
  if (this._nextErrors) {
@@ -47,10 +47,10 @@ export default class Form extends (PureComponent || Component) {
  }
 
  $(name) {
- const handler = this.cache.fetch(name, () => this.set.bind(this, name));
+ const handler = this._handlersCache.fetch(name, () => this.set.bind(this, name));
 
  const wrapper = (handler, ...bindings) => {
- wrapper.onChange = this.cache.fetch([name, handler, ...bindings], () => {
+ wrapper.onChange = this._handlersCache.fetch([name, handler, ...bindings], () => {
  return handler.hasOwnProperty('prototype') ? handler.bind(this, ...bindings) : handler;
  });
 

src/utils.js

@@ -142,12 +142,11 @@ class Cache {
  }
 
  fetchSimple(key, setter) {
- if (this.store[key]) {
- return this.store[key];
- } else {
+ if (!(key in this.store)) {
  this.store[key] = setter();
- return this.store[key];
  }
+
+ return this.store[key];
  }
 
  fetchComplex([name, ...path], setter) {
@@ -157,6 +156,7 @@ class Cache {
  for (let i = 0; i < path.length - 1; i++) {
  if (typeof this.get(current, path[i]) === 'undefined') {
  const nextKey = path[i + 1];
+
  this.put(current, path[i],
  typeof nextKey === 'number' ||
  typeof nextKey === 'string' ||
@@ -167,11 +167,12 @@ class Cache {
  current = this.get(current, path[i]);
  }
  const key = path[path.length - 1], cached = this.get(current, key);
+
  return cached || this.put(current, key, setter());
  }
 
  get(store, key) {
- if (store.constructor === WeakMap) {
+ if (store instanceof WeakMap) {
  return store.get(key);
  } else {
  return store[key];
@@ -184,6 +185,7 @@ class Cache {
  } else {
  store[key] = value;
  }
+
  return value;
  }
 }