Merge pull request facebook#172 from jarsbe/refactor/dispatcher

Refactor/dispatcher
harrykiselev · Mar 7, 2015 · 172a114 · 172a114
2 parents d48a06d + 4da3dca
commit 172a114
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 48 deletions.
diff --git a/examples/flux-chat/js/actions/ChatMessageActionCreators.js b/examples/flux-chat/js/actions/ChatMessageActionCreators.js
@@ -20,7 +20,7 @@ var ActionTypes = ChatConstants.ActionTypes;
 module.exports = {
 
   createMessage: function(text, currentThreadID) {
-    ChatAppDispatcher.handleViewAction({
+    ChatAppDispatcher.dispatch({
       type: ActionTypes.CREATE_MESSAGE,
       text: text,
       currentThreadID: currentThreadID

diff --git a/examples/flux-chat/js/actions/ChatServerActionCreators.js b/examples/flux-chat/js/actions/ChatServerActionCreators.js
@@ -18,14 +18,14 @@ var ActionTypes = ChatConstants.ActionTypes;
 module.exports = {
 
   receiveAll: function(rawMessages) {
-    ChatAppDispatcher.handleServerAction({
+    ChatAppDispatcher.dispatch({
       type: ActionTypes.RECEIVE_RAW_MESSAGES,
       rawMessages: rawMessages
     });
   },
 
   receiveCreatedMessage: function(createdMessage) {
-    ChatAppDispatcher.handleServerAction({
+    ChatAppDispatcher.dispatch({
       type: ActionTypes.RECEIVE_RAW_CREATED_MESSAGE,
       rawMessage: createdMessage
     });

diff --git a/examples/flux-chat/js/actions/ChatThreadActionCreators.js b/examples/flux-chat/js/actions/ChatThreadActionCreators.js
@@ -18,7 +18,7 @@ var ActionTypes = ChatConstants.ActionTypes;
 module.exports = {
 
   clickThread: function(threadID) {
-    ChatAppDispatcher.handleViewAction({
+    ChatAppDispatcher.dispatch({
       type: ActionTypes.CLICK_THREAD,
       threadID: threadID
     });

diff --git a/examples/flux-chat/js/constants/ChatConstants.js b/examples/flux-chat/js/constants/ChatConstants.js
@@ -19,11 +19,6 @@ module.exports = {
     CREATE_MESSAGE: null,
     RECEIVE_RAW_CREATED_MESSAGE: null,
     RECEIVE_RAW_MESSAGES: null
-  }),
-
-  PayloadSources: keyMirror({
-    SERVER_ACTION: null,
-    VIEW_ACTION: null
   })
 
 };
diff --git a/examples/flux-chat/js/dispatcher/ChatAppDispatcher.js b/examples/flux-chat/js/dispatcher/ChatAppDispatcher.js
@@ -10,38 +10,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-var ChatConstants = require('../constants/ChatConstants');
 var Dispatcher = require('flux').Dispatcher;
-var assign = require('object-assign');
 
-var PayloadSources = ChatConstants.PayloadSources;
-
-var ChatAppDispatcher = assign(new Dispatcher(), {
-
-  /**
-   * @param {object} action The details of the action, including the action's
-   * type and additional data coming from the server.
-   */
-  handleServerAction: function(action) {
-    var payload = {
-      source: PayloadSources.SERVER_ACTION,
-      action: action
-    };
-    this.dispatch(payload);
-  },
-
-  /**
-   * @param {object} action The details of the action, including the action's
-   * type and additional data coming from the view.
-   */
-  handleViewAction: function(action) {
-    var payload = {
-      source: PayloadSources.VIEW_ACTION,
-      action: action
-    };
-    this.dispatch(payload);
-  }
-
-});
-
-module.exports = ChatAppDispatcher;
+module.exports = new Dispatcher();
diff --git a/examples/flux-chat/js/stores/MessageStore.js b/examples/flux-chat/js/stores/MessageStore.js
@@ -93,8 +93,7 @@ var MessageStore = assign({}, EventEmitter.prototype, {
 
 });
 
-MessageStore.dispatchToken = ChatAppDispatcher.register(function(payload) {
-  var action = payload.action;
+MessageStore.dispatchToken = ChatAppDispatcher.register(function(action) {
 
   switch(action.type) {
 

diff --git a/examples/flux-chat/js/stores/ThreadStore.js b/examples/flux-chat/js/stores/ThreadStore.js
@@ -102,8 +102,7 @@ var ThreadStore = assign({}, EventEmitter.prototype, {
 
 });
 
-ThreadStore.dispatchToken = ChatAppDispatcher.register(function(payload) {
-  var action = payload.action;
+ThreadStore.dispatchToken = ChatAppDispatcher.register(function(action) {
 
   switch(action.type) {
 

diff --git a/examples/flux-chat/js/stores/UnreadThreadStore.js b/examples/flux-chat/js/stores/UnreadThreadStore.js
@@ -53,13 +53,12 @@ var UnreadThreadStore = assign({}, EventEmitter.prototype, {
 
 });
 
-UnreadThreadStore.dispatchToken = ChatAppDispatcher.register(function(payload) {
+UnreadThreadStore.dispatchToken = ChatAppDispatcher.register(function(action) {
   ChatAppDispatcher.waitFor([
     ThreadStore.dispatchToken,
     MessageStore.dispatchToken
   ]);
 
-  var action = payload.action;
   switch (action.type) {
 
     case ActionTypes.CLICK_THREAD: