Merge pull request #85 from deloreanjs/find_dispatcher_fix

Fix find dispatcher issue with react 0.13.x

Author: darcyadams

dist/delorean.js

@@ -1,4 +1,4 @@
-/*! delorean - v0.8.7 - 2015-03-24 */
+/*! delorean - v0.8.7 - 2015-05-27 */
 (function (DeLorean) {
   'use strict';
 
@@ -33,16 +33,11 @@
 
   // `__findDispatcher` is a private function for **React components**.
   function __findDispatcher(view) {
-     // Provide a useful error message if no dispatcher is found in the chain
-    if (view == null) {
-      throw 'No dispatcher found. The DeLoreanJS mixin requires a "dispatcher" property to be passed to a component, or one of it\'s ancestors.';
+     // Provide a useful error message if no dispatcher is found
+    if (DeLorean.dispatcher == null) {
+      throw 'No dispatcher found. The DeLoreanJS mixin requires a "dispatcher" has been created using Flux.createDispatcher.';
     }
-    /* `view` should be a component instance. If a component don't have
-        any dispatcher, it tries to find a dispatcher from the parents. */
-    if (!view.props.dispatcher) {
-      return __findDispatcher(view._owner);
-    }
-    return view.props.dispatcher;
+    return DeLorean.dispatcher;
   }
 
   // `__clone` creates a deep copy of an object.
@@ -111,10 +106,12 @@
     }
 
     // `dispatch` method dispatch the event with `data` (or **payload**)
-    Dispatcher.prototype.dispatch = function (actionName, data) {
-      var self = this, stores, deferred;
+    Dispatcher.prototype.dispatch = function () {
+      var self = this, stores, deferred, args;
+      args = Array.prototype.slice.call(arguments);
+
+      this.listener.emit.apply(this.listener, ['dispatch'].concat(args));
 
-      this.listener.emit('dispatch', actionName, data);
       /* Stores are key-value pairs. Collect store instances into an array. */
       stores = (function () {
         var stores = [], store;
@@ -131,11 +128,11 @@
 
       // Store instances should wait for finish. So you can know if all the
       // stores are dispatched properly.
-      deferred = this.waitFor(stores, actionName);
+      deferred = this.waitFor(stores, args[0]);
 
       /* Payload should send to all related stores. */
       for (var storeName in self.stores) {
-        self.stores[storeName].dispatchAction(actionName, data);
+        self.stores[storeName].dispatchAction.apply(self.stores[storeName], args);
       }
 
       // `dispatch` returns deferred object you can just use **promise**
@@ -535,6 +532,16 @@
         }
       }
 
+      // Allow only a single dispatcher
+      if (DeLorean.dispatcher != null) {
+        if (console != null) {
+          console.warn('You are attempting to create more than one dispatcher. DeLorean is intended to be used with a single dispatcher. This latest dispatcher created will overwrite any previous versions.');
+        }
+      }
+
+      // Create an internal reference to the dispathcer instance. This allows it to be found by the mixins.
+      DeLorean.dispatcher = dispatcher;
+
       return dispatcher;
     },
     // ### `DeLorean.Flux.define`
@@ -652,6 +659,13 @@
 
       // `getStore` is a shortcut to get the store from the state.
       getStore: function (storeName) {
+        if (console != null && typeof this.__watchStores[storeName] === 'undefined') {
+          var message;
+          message = 'Attempt to getStore ' + storeName + ' failed. ';
+          message += typeof this.stores[storeName] === 'undefined' ? 'It is not defined on the dispatcher. ' : 'It is not being watched by the component. ';
+          message += this.constructor != null && this.constructor.displayName != null ? 'Check the ' + this.constructor.displayName + ' component.' : '';
+          console.warn(message);
+        }
         return this.state.stores[storeName];
       }
     }