Merge pull request #96 from f/trigger_mixin

fix some formatting and run the build
f · May 23, 2016 · 470bff8 · 470bff8
2 parents a86c138 + 0eaa9df
commit 470bff8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/dist/delorean.js b/dist/delorean.js
@@ -1,4 +1,4 @@
-/*! delorean - v0.9.6-0 - 2015-08-24 */
+/*! delorean - v0.9.8 - 2016-05-23 */
 (function (DeLorean) {
   'use strict';
 
@@ -99,7 +99,6 @@
       DeLorean.EventEmitter.defaultMaxListeners = 50;
       this.listener = new DeLorean.EventEmitter();
       this.stores = stores;
-
       /* Stores should be listened for rollback events. */
       __rollbackListener(Object.keys(stores).map(function (key) {
         return stores[key];
@@ -567,6 +566,17 @@
 
   // ## Built-in React Mixin
   DeLorean.Flux.mixins = {
+
+    // This mixin adds the this.trigger method to the component
+    // Components can then trigger actions in flux w/out watching stores and having their state
+    trigger: {
+      componentWillMount: function () {
+        this.__dispatcher = __findDispatcher(this);
+      },
+      trigger: function () {
+        this.__dispatcher.emit.apply(this.__dispatcher, arguments);
+      }
+    },
     // It should be inserted to the React components which
     // used in Flux.
     // Simply `mixin: [Flux.mixins.storeListener]` will work.

diff --git a/dist/delorean.min.js b/dist/delorean.min.js
diff --git a/dist/delorean.min.js.map b/dist/delorean.min.js.map
diff --git a/src/delorean.js b/src/delorean.js
@@ -98,7 +98,6 @@
       DeLorean.EventEmitter.defaultMaxListeners = 50;
       this.listener = new DeLorean.EventEmitter();
       this.stores = stores;
-
       /* Stores should be listened for rollback events. */
       __rollbackListener(Object.keys(stores).map(function (key) {
         return stores[key];
@@ -570,17 +569,13 @@
     // This mixin adds the this.trigger method to the component
     // Components can then trigger actions in flux w/out watching stores and having their state
     trigger: {
-
       componentWillMount: function () {
         this.__dispatcher = __findDispatcher(this);
       },
-
       trigger: function () {
         this.__dispatcher.emit.apply(this.__dispatcher, arguments);
       }
-
     },
-
     // It should be inserted to the React components which
     // used in Flux.
     // Simply `mixin: [Flux.mixins.storeListener]` will work.

diff --git a/test/spec/core/fluxSpec.js b/test/spec/core/fluxSpec.js
@@ -95,22 +95,18 @@ describe('Flux', function () {
   });
 
   it('should cleanup unused events after firing an action handler', function () {
-    MyAppDispatcher.dispatch('noChange', 'someText')
-    MyAppDispatcher.dispatch('noChange', 'someText')
-    MyAppDispatcher.dispatch('noChange', 'someText')
-    MyAppDispatcher.dispatch('noChange', 'someText')
-
+    MyAppDispatcher.dispatch('noChange', 'someText');
+    MyAppDispatcher.dispatch('noChange', 'someText');
+    MyAppDispatcher.dispatch('noChange', 'someText');
+    MyAppDispatcher.dispatch('noChange', 'someText');
     changeListenerCount = myStore.listener.listeners('change').length;
     rollbackListenerCount = myStore.listener.listeners('rollback').length;
-
     // Note that the 'cleanup_{actionName}' event has not fired yet and removed the last 2 events (change & rolback), so there will be one remaining of each event at this point.
     // however, without the cleanup, there would be 4 of each after 4 calls
     expect(changeListenerCount).toEqual(1);
     expect(rollbackListenerCount).toEqual(1);
-
   });
 
-
   it('dispatcher can listen events', function () {
     var spy = jasmine.createSpy('dispatcher listener');
     MyAppDispatcher.on('hello', spy);