fix connect and listenermixin combo (fixes #118)

src/ListenerMixin.js

@@ -4,6 +4,8 @@ var _ = require('./utils'),
 /**
  * A module meant to be consumed as a mixin by a React component. Supplies the methods from
  * `ListenerMethods` mixin and takes care of teardown of subscriptions.
+ * Note that if you're using the `connect` mixin you don't need this mixin, as connect will
+ * import everything this mixin contains!
  */
 module.exports = _.extend({
 

src/connect.js

@@ -4,13 +4,18 @@ var Reflux = require('../src'),
 module.exports = function(listenable,key){
     return {
         componentDidMount: function(){
+            var warned = false;
             for(var m in Reflux.ListenerMethods){
-                if (this[m] !== Reflux.ListenerMethods[m]){
-                    if (this[m]){
-                        throw "Can't have other property '"+m+"' when using Reflux.listenTo!";
-                    }
-                    this[m] = Reflux.ListenerMethods[m];
+                if (this[m] && typeof console && typeof console.warn === "function" && !warned ){
+                    console.warn(
+                        "Component using Reflux.connect already had property '"+m+"'. "+
+                        "Either you had your own property with that name which was now overridden, "+
+                        "or you combined connect with ListenerMixin which is unnecessary as connect "+
+                        "will include the ListenerMixin methods automatically."
+                    );
+                    warned = true;
                 }
+                this[m] = Reflux.ListenerMethods[m];
             }
             var me = this, cb = (key === undefined ? this.setState : function(v){me.setState(_.object([key],[v]));});
             this.listenTo(listenable,cb,cb);

test/usingConnectMixin.spec.js

@@ -83,4 +83,15 @@ describe('using the connect(...) mixin',function(){
             assert.deepEqual([_.object([key],[triggerdata])],context.setState.firstCall.args);
         });
     });
+    describe("together with ListenerMixin in a React component",function(){
+        var store = Reflux.createStore({}),
+            def = {setState:function(){}},
+            fakecomponent = _.extend(def,Reflux.connect(store),Reflux.ListenerMethods);
+        it("should log a warning)",function(){
+            sinon.spy(console,"warn");
+            fakecomponent.componentDidMount();
+            assert(console.warn.calledOnce);
+            console.warn.restore();
+        });
+    });
 });